diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventBaseProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventBaseProperties.Serialization.cs
deleted file mode 100644
index 172820121300..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventBaseProperties.Serialization.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatEventBaseProperties : IUtf8JsonSerializable, IJsonModel<AcsChatEventBaseProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatEventBaseProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatEventBaseProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatEventBaseProperties)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("recipientCommunicationIdentifier"u8);
-            writer.WriteObjectValue(RecipientCommunicationIdentifier, options);
-            if (Optional.IsDefined(TransactionId))
-            {
-                writer.WritePropertyName("transactionId"u8);
-                writer.WriteStringValue(TransactionId);
-            }
-            if (Optional.IsDefined(ThreadId))
-            {
-                writer.WritePropertyName("threadId"u8);
-                writer.WriteStringValue(ThreadId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsChatEventBaseProperties IJsonModel<AcsChatEventBaseProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatEventBaseProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatEventBaseProperties(document.RootElement, options);
-        }
-
-        internal static AcsChatEventBaseProperties DeserializeAcsChatEventBaseProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatEventBaseProperties(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsChatEventBaseProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatEventBaseProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatEventBaseProperties IPersistableModel<AcsChatEventBaseProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatEventBaseProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatEventBaseProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatEventBaseProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsChatEventBaseProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatEventBaseProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventBaseProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventBaseProperties.cs
deleted file mode 100644
index ab0c02f851ba..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventBaseProperties.cs
+++ /dev/null
@@ -1,83 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all chat events. </summary>
-    public partial class AcsChatEventBaseProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/> is null. </exception>
-        internal AcsChatEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-
-            RecipientCommunicationIdentifier = recipientCommunicationIdentifier;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsChatEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            RecipientCommunicationIdentifier = recipientCommunicationIdentifier;
-            TransactionId = transactionId;
-            ThreadId = threadId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatEventBaseProperties"/> for deserialization. </summary>
-        internal AcsChatEventBaseProperties()
-        {
-        }
-
-        /// <summary> The communication identifier of the target user. </summary>
-        public CommunicationIdentifierModel RecipientCommunicationIdentifier { get; }
-        /// <summary> The transaction id will be used as co-relation vector. </summary>
-        public string TransactionId { get; }
-        /// <summary> The chat thread id. </summary>
-        public string ThreadId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventInThreadBaseProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventInThreadBaseProperties.Serialization.cs
deleted file mode 100644
index 8c1f443284ad..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventInThreadBaseProperties.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatEventInThreadBaseProperties : IUtf8JsonSerializable, IJsonModel<AcsChatEventInThreadBaseProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatEventInThreadBaseProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatEventInThreadBaseProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatEventInThreadBaseProperties)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TransactionId))
-            {
-                writer.WritePropertyName("transactionId"u8);
-                writer.WriteStringValue(TransactionId);
-            }
-            if (Optional.IsDefined(ThreadId))
-            {
-                writer.WritePropertyName("threadId"u8);
-                writer.WriteStringValue(ThreadId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsChatEventInThreadBaseProperties IJsonModel<AcsChatEventInThreadBaseProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatEventInThreadBaseProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatEventInThreadBaseProperties(document.RootElement, options);
-        }
-
-        internal static AcsChatEventInThreadBaseProperties DeserializeAcsChatEventInThreadBaseProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatEventInThreadBaseProperties(transactionId, threadId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsChatEventInThreadBaseProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatEventInThreadBaseProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatEventInThreadBaseProperties IPersistableModel<AcsChatEventInThreadBaseProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatEventInThreadBaseProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatEventInThreadBaseProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatEventInThreadBaseProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsChatEventInThreadBaseProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatEventInThreadBaseProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventInThreadBaseProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventInThreadBaseProperties.cs
deleted file mode 100644
index a19356f6f111..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatEventInThreadBaseProperties.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all thread-level chat events. </summary>
-    public partial class AcsChatEventInThreadBaseProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatEventInThreadBaseProperties"/>. </summary>
-        internal AcsChatEventInThreadBaseProperties()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatEventInThreadBaseProperties"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsChatEventInThreadBaseProperties(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TransactionId = transactionId;
-            ThreadId = threadId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The transaction id will be used as co-relation vector. </summary>
-        public string TransactionId { get; }
-        /// <summary> The chat thread id. </summary>
-        public string ThreadId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedEventData.Serialization.cs
deleted file mode 100644
index a4aae168de79..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatMessageDeletedEventData : IUtf8JsonSerializable, IJsonModel<AcsChatMessageDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatMessageDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatMessageDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("deleteTime"u8);
-            writer.WriteStringValue(DeleteTime, "O");
-        }
-
-        AcsChatMessageDeletedEventData IJsonModel<AcsChatMessageDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatMessageDeletedEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatMessageDeletedEventData DeserializeAcsChatMessageDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset deleteTime = default;
-            string messageId = default;
-            CommunicationIdentifierModel senderCommunicationIdentifier = default;
-            string senderDisplayName = default;
-            DateTimeOffset composeTime = default;
-            string type = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deleteTime"u8))
-                {
-                    deleteTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("senderCommunicationIdentifier"u8))
-                {
-                    senderCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("senderDisplayName"u8))
-                {
-                    senderDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("composeTime"u8))
-                {
-                    composeTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatMessageDeletedEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                deleteTime);
-        }
-
-        BinaryData IPersistableModel<AcsChatMessageDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatMessageDeletedEventData IPersistableModel<AcsChatMessageDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatMessageDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatMessageDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatMessageDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatMessageDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedEventData.cs
deleted file mode 100644
index 29bd2123a788..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedEventData.cs
+++ /dev/null
@@ -1,55 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatMessageDeleted event. </summary>
-    public partial class AcsChatMessageDeletedEventData : AcsChatMessageEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageDeletedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="deleteTime"> The time at which the message was deleted. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/> or <paramref name="senderCommunicationIdentifier"/> is null. </exception>
-        internal AcsChatMessageDeletedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, CommunicationIdentifierModel senderCommunicationIdentifier, DateTimeOffset composeTime, DateTimeOffset deleteTime) : base(recipientCommunicationIdentifier, senderCommunicationIdentifier, composeTime)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(senderCommunicationIdentifier, nameof(senderCommunicationIdentifier));
-
-            DeleteTime = deleteTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageDeletedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="deleteTime"> The time at which the message was deleted. </param>
-        internal AcsChatMessageDeletedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, CommunicationIdentifierModel senderCommunicationIdentifier, string senderDisplayName, DateTimeOffset composeTime, string type, long? version, DateTimeOffset deleteTime) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData, messageId, senderCommunicationIdentifier, senderDisplayName, composeTime, type, version)
-        {
-            DeleteTime = deleteTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageDeletedEventData"/> for deserialization. </summary>
-        internal AcsChatMessageDeletedEventData()
-        {
-        }
-
-        /// <summary> The time at which the message was deleted. </summary>
-        public DateTimeOffset DeleteTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedInThreadEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedInThreadEventData.Serialization.cs
deleted file mode 100644
index bceef0c48673..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedInThreadEventData.Serialization.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatMessageDeletedInThreadEventData : IUtf8JsonSerializable, IJsonModel<AcsChatMessageDeletedInThreadEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatMessageDeletedInThreadEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatMessageDeletedInThreadEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageDeletedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageDeletedInThreadEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("deleteTime"u8);
-            writer.WriteStringValue(DeleteTime, "O");
-        }
-
-        AcsChatMessageDeletedInThreadEventData IJsonModel<AcsChatMessageDeletedInThreadEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageDeletedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageDeletedInThreadEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatMessageDeletedInThreadEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatMessageDeletedInThreadEventData DeserializeAcsChatMessageDeletedInThreadEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset deleteTime = default;
-            string messageId = default;
-            CommunicationIdentifierModel senderCommunicationIdentifier = default;
-            string senderDisplayName = default;
-            DateTimeOffset composeTime = default;
-            string type = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deleteTime"u8))
-                {
-                    deleteTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("senderCommunicationIdentifier"u8))
-                {
-                    senderCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("senderDisplayName"u8))
-                {
-                    senderDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("composeTime"u8))
-                {
-                    composeTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatMessageDeletedInThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                deleteTime);
-        }
-
-        BinaryData IPersistableModel<AcsChatMessageDeletedInThreadEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageDeletedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageDeletedInThreadEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatMessageDeletedInThreadEventData IPersistableModel<AcsChatMessageDeletedInThreadEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageDeletedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatMessageDeletedInThreadEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageDeletedInThreadEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatMessageDeletedInThreadEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatMessageDeletedInThreadEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatMessageDeletedInThreadEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedInThreadEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedInThreadEventData.cs
deleted file mode 100644
index fdf50c683027..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageDeletedInThreadEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatMessageDeletedInThread event. </summary>
-    public partial class AcsChatMessageDeletedInThreadEventData : AcsChatMessageEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageDeletedInThreadEventData"/>. </summary>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="deleteTime"> The time at which the message was deleted. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="senderCommunicationIdentifier"/> is null. </exception>
-        internal AcsChatMessageDeletedInThreadEventData(CommunicationIdentifierModel senderCommunicationIdentifier, DateTimeOffset composeTime, DateTimeOffset deleteTime) : base(senderCommunicationIdentifier, composeTime)
-        {
-            Argument.AssertNotNull(senderCommunicationIdentifier, nameof(senderCommunicationIdentifier));
-
-            DeleteTime = deleteTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageDeletedInThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="deleteTime"> The time at which the message was deleted. </param>
-        internal AcsChatMessageDeletedInThreadEventData(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, CommunicationIdentifierModel senderCommunicationIdentifier, string senderDisplayName, DateTimeOffset composeTime, string type, long? version, DateTimeOffset deleteTime) : base(transactionId, threadId, serializedAdditionalRawData, messageId, senderCommunicationIdentifier, senderDisplayName, composeTime, type, version)
-        {
-            DeleteTime = deleteTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageDeletedInThreadEventData"/> for deserialization. </summary>
-        internal AcsChatMessageDeletedInThreadEventData()
-        {
-        }
-
-        /// <summary> The time at which the message was deleted. </summary>
-        public DateTimeOffset DeleteTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedEventData.Serialization.cs
deleted file mode 100644
index 97ee30c1867a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedEventData.Serialization.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatMessageEditedEventData : IUtf8JsonSerializable, IJsonModel<AcsChatMessageEditedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatMessageEditedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatMessageEditedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEditedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageEditedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(MessageBody))
-            {
-                writer.WritePropertyName("messageBody"u8);
-                writer.WriteStringValue(MessageBody);
-            }
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("editTime"u8);
-            writer.WriteStringValue(EditTime, "O");
-        }
-
-        AcsChatMessageEditedEventData IJsonModel<AcsChatMessageEditedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEditedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageEditedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatMessageEditedEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatMessageEditedEventData DeserializeAcsChatMessageEditedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string messageBody = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            DateTimeOffset editTime = default;
-            string messageId = default;
-            CommunicationIdentifierModel senderCommunicationIdentifier = default;
-            string senderDisplayName = default;
-            DateTimeOffset composeTime = default;
-            string type = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("messageBody"u8))
-                {
-                    messageBody = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("editTime"u8))
-                {
-                    editTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("senderCommunicationIdentifier"u8))
-                {
-                    senderCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("senderDisplayName"u8))
-                {
-                    senderDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("composeTime"u8))
-                {
-                    composeTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatMessageEditedEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                messageBody,
-                metadata,
-                editTime);
-        }
-
-        BinaryData IPersistableModel<AcsChatMessageEditedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEditedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageEditedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatMessageEditedEventData IPersistableModel<AcsChatMessageEditedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEditedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatMessageEditedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageEditedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatMessageEditedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatMessageEditedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatMessageEditedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedEventData.cs
deleted file mode 100644
index 92f3f537ac6c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedEventData.cs
+++ /dev/null
@@ -1,66 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatMessageEdited event. </summary>
-    public partial class AcsChatMessageEditedEventData : AcsChatMessageEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEditedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <param name="editTime"> The time at which the message was edited. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/>, <paramref name="senderCommunicationIdentifier"/> or <paramref name="metadata"/> is null. </exception>
-        internal AcsChatMessageEditedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, CommunicationIdentifierModel senderCommunicationIdentifier, DateTimeOffset composeTime, IReadOnlyDictionary<string, string> metadata, DateTimeOffset editTime) : base(recipientCommunicationIdentifier, senderCommunicationIdentifier, composeTime)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(senderCommunicationIdentifier, nameof(senderCommunicationIdentifier));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-
-            Metadata = metadata;
-            EditTime = editTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEditedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="messageBody"> The body of the chat message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <param name="editTime"> The time at which the message was edited. </param>
-        internal AcsChatMessageEditedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, CommunicationIdentifierModel senderCommunicationIdentifier, string senderDisplayName, DateTimeOffset composeTime, string type, long? version, string messageBody, IReadOnlyDictionary<string, string> metadata, DateTimeOffset editTime) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData, messageId, senderCommunicationIdentifier, senderDisplayName, composeTime, type, version)
-        {
-            MessageBody = messageBody;
-            Metadata = metadata;
-            EditTime = editTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEditedEventData"/> for deserialization. </summary>
-        internal AcsChatMessageEditedEventData()
-        {
-        }
-
-        /// <summary> The body of the chat message. </summary>
-        public string MessageBody { get; }
-        /// <summary> The chat message metadata. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-        /// <summary> The time at which the message was edited. </summary>
-        public DateTimeOffset EditTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedInThreadEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedInThreadEventData.Serialization.cs
deleted file mode 100644
index 7bf5019d2ec1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedInThreadEventData.Serialization.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatMessageEditedInThreadEventData : IUtf8JsonSerializable, IJsonModel<AcsChatMessageEditedInThreadEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatMessageEditedInThreadEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatMessageEditedInThreadEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEditedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageEditedInThreadEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(MessageBody))
-            {
-                writer.WritePropertyName("messageBody"u8);
-                writer.WriteStringValue(MessageBody);
-            }
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("editTime"u8);
-            writer.WriteStringValue(EditTime, "O");
-        }
-
-        AcsChatMessageEditedInThreadEventData IJsonModel<AcsChatMessageEditedInThreadEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEditedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageEditedInThreadEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatMessageEditedInThreadEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatMessageEditedInThreadEventData DeserializeAcsChatMessageEditedInThreadEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string messageBody = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            DateTimeOffset editTime = default;
-            string messageId = default;
-            CommunicationIdentifierModel senderCommunicationIdentifier = default;
-            string senderDisplayName = default;
-            DateTimeOffset composeTime = default;
-            string type = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("messageBody"u8))
-                {
-                    messageBody = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("editTime"u8))
-                {
-                    editTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("senderCommunicationIdentifier"u8))
-                {
-                    senderCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("senderDisplayName"u8))
-                {
-                    senderDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("composeTime"u8))
-                {
-                    composeTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatMessageEditedInThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                messageBody,
-                metadata,
-                editTime);
-        }
-
-        BinaryData IPersistableModel<AcsChatMessageEditedInThreadEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEditedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageEditedInThreadEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatMessageEditedInThreadEventData IPersistableModel<AcsChatMessageEditedInThreadEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEditedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatMessageEditedInThreadEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageEditedInThreadEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatMessageEditedInThreadEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatMessageEditedInThreadEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatMessageEditedInThreadEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedInThreadEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedInThreadEventData.cs
deleted file mode 100644
index 99134233639c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEditedInThreadEventData.cs
+++ /dev/null
@@ -1,63 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatMessageEditedInThread event. </summary>
-    public partial class AcsChatMessageEditedInThreadEventData : AcsChatMessageEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEditedInThreadEventData"/>. </summary>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <param name="editTime"> The time at which the message was edited. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="senderCommunicationIdentifier"/> or <paramref name="metadata"/> is null. </exception>
-        internal AcsChatMessageEditedInThreadEventData(CommunicationIdentifierModel senderCommunicationIdentifier, DateTimeOffset composeTime, IReadOnlyDictionary<string, string> metadata, DateTimeOffset editTime) : base(senderCommunicationIdentifier, composeTime)
-        {
-            Argument.AssertNotNull(senderCommunicationIdentifier, nameof(senderCommunicationIdentifier));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-
-            Metadata = metadata;
-            EditTime = editTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEditedInThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="messageBody"> The body of the chat message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <param name="editTime"> The time at which the message was edited. </param>
-        internal AcsChatMessageEditedInThreadEventData(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, CommunicationIdentifierModel senderCommunicationIdentifier, string senderDisplayName, DateTimeOffset composeTime, string type, long? version, string messageBody, IReadOnlyDictionary<string, string> metadata, DateTimeOffset editTime) : base(transactionId, threadId, serializedAdditionalRawData, messageId, senderCommunicationIdentifier, senderDisplayName, composeTime, type, version)
-        {
-            MessageBody = messageBody;
-            Metadata = metadata;
-            EditTime = editTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEditedInThreadEventData"/> for deserialization. </summary>
-        internal AcsChatMessageEditedInThreadEventData()
-        {
-        }
-
-        /// <summary> The body of the chat message. </summary>
-        public string MessageBody { get; }
-        /// <summary> The chat message metadata. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-        /// <summary> The time at which the message was edited. </summary>
-        public DateTimeOffset EditTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventBaseProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventBaseProperties.Serialization.cs
deleted file mode 100644
index 5c8edcacc2cc..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventBaseProperties.Serialization.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatMessageEventBaseProperties : IUtf8JsonSerializable, IJsonModel<AcsChatMessageEventBaseProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatMessageEventBaseProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatMessageEventBaseProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageEventBaseProperties)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(MessageId))
-            {
-                writer.WritePropertyName("messageId"u8);
-                writer.WriteStringValue(MessageId);
-            }
-            writer.WritePropertyName("senderCommunicationIdentifier"u8);
-            writer.WriteObjectValue(SenderCommunicationIdentifier, options);
-            if (Optional.IsDefined(SenderDisplayName))
-            {
-                writer.WritePropertyName("senderDisplayName"u8);
-                writer.WriteStringValue(SenderDisplayName);
-            }
-            writer.WritePropertyName("composeTime"u8);
-            writer.WriteStringValue(ComposeTime, "O");
-            if (Optional.IsDefined(Type))
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteNumberValue(Version.Value);
-            }
-        }
-
-        AcsChatMessageEventBaseProperties IJsonModel<AcsChatMessageEventBaseProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageEventBaseProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatMessageEventBaseProperties(document.RootElement, options);
-        }
-
-        internal static AcsChatMessageEventBaseProperties DeserializeAcsChatMessageEventBaseProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string messageId = default;
-            CommunicationIdentifierModel senderCommunicationIdentifier = default;
-            string senderDisplayName = default;
-            DateTimeOffset composeTime = default;
-            string type = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("senderCommunicationIdentifier"u8))
-                {
-                    senderCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("senderDisplayName"u8))
-                {
-                    senderDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("composeTime"u8))
-                {
-                    composeTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatMessageEventBaseProperties(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version);
-        }
-
-        BinaryData IPersistableModel<AcsChatMessageEventBaseProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageEventBaseProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatMessageEventBaseProperties IPersistableModel<AcsChatMessageEventBaseProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatMessageEventBaseProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageEventBaseProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatMessageEventBaseProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatMessageEventBaseProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatMessageEventBaseProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventBaseProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventBaseProperties.cs
deleted file mode 100644
index d0109a86be03..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventBaseProperties.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all chat message events. </summary>
-    public partial class AcsChatMessageEventBaseProperties : AcsChatEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/> or <paramref name="senderCommunicationIdentifier"/> is null. </exception>
-        internal AcsChatMessageEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier, CommunicationIdentifierModel senderCommunicationIdentifier, DateTimeOffset composeTime) : base(recipientCommunicationIdentifier)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(senderCommunicationIdentifier, nameof(senderCommunicationIdentifier));
-
-            SenderCommunicationIdentifier = senderCommunicationIdentifier;
-            ComposeTime = composeTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        internal AcsChatMessageEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, CommunicationIdentifierModel senderCommunicationIdentifier, string senderDisplayName, DateTimeOffset composeTime, string type, long? version) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData)
-        {
-            MessageId = messageId;
-            SenderCommunicationIdentifier = senderCommunicationIdentifier;
-            SenderDisplayName = senderDisplayName;
-            ComposeTime = composeTime;
-            Type = type;
-            Version = version;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEventBaseProperties"/> for deserialization. </summary>
-        internal AcsChatMessageEventBaseProperties()
-        {
-        }
-
-        /// <summary> The chat message id. </summary>
-        public string MessageId { get; }
-        /// <summary> The communication identifier of the sender. </summary>
-        public CommunicationIdentifierModel SenderCommunicationIdentifier { get; }
-        /// <summary> The display name of the sender. </summary>
-        public string SenderDisplayName { get; }
-        /// <summary> The original compose time of the message. </summary>
-        public DateTimeOffset ComposeTime { get; }
-        /// <summary> The type of the message. </summary>
-        public string Type { get; }
-        /// <summary> The version of the message. </summary>
-        public long? Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventInThreadBaseProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventInThreadBaseProperties.Serialization.cs
deleted file mode 100644
index daf9837f457b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventInThreadBaseProperties.Serialization.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatMessageEventInThreadBaseProperties : IUtf8JsonSerializable, IJsonModel<AcsChatMessageEventInThreadBaseProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatMessageEventInThreadBaseProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatMessageEventInThreadBaseProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageEventInThreadBaseProperties)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(MessageId))
-            {
-                writer.WritePropertyName("messageId"u8);
-                writer.WriteStringValue(MessageId);
-            }
-            writer.WritePropertyName("senderCommunicationIdentifier"u8);
-            writer.WriteObjectValue(SenderCommunicationIdentifier, options);
-            if (Optional.IsDefined(SenderDisplayName))
-            {
-                writer.WritePropertyName("senderDisplayName"u8);
-                writer.WriteStringValue(SenderDisplayName);
-            }
-            writer.WritePropertyName("composeTime"u8);
-            writer.WriteStringValue(ComposeTime, "O");
-            if (Optional.IsDefined(Type))
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteNumberValue(Version.Value);
-            }
-        }
-
-        AcsChatMessageEventInThreadBaseProperties IJsonModel<AcsChatMessageEventInThreadBaseProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageEventInThreadBaseProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatMessageEventInThreadBaseProperties(document.RootElement, options);
-        }
-
-        internal static AcsChatMessageEventInThreadBaseProperties DeserializeAcsChatMessageEventInThreadBaseProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string messageId = default;
-            CommunicationIdentifierModel senderCommunicationIdentifier = default;
-            string senderDisplayName = default;
-            DateTimeOffset composeTime = default;
-            string type = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("senderCommunicationIdentifier"u8))
-                {
-                    senderCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("senderDisplayName"u8))
-                {
-                    senderDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("composeTime"u8))
-                {
-                    composeTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatMessageEventInThreadBaseProperties(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version);
-        }
-
-        BinaryData IPersistableModel<AcsChatMessageEventInThreadBaseProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageEventInThreadBaseProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatMessageEventInThreadBaseProperties IPersistableModel<AcsChatMessageEventInThreadBaseProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatMessageEventInThreadBaseProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageEventInThreadBaseProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatMessageEventInThreadBaseProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatMessageEventInThreadBaseProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatMessageEventInThreadBaseProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventInThreadBaseProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventInThreadBaseProperties.cs
deleted file mode 100644
index 72fdab5e25f7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageEventInThreadBaseProperties.cs
+++ /dev/null
@@ -1,66 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all thread-level chat message events. </summary>
-    public partial class AcsChatMessageEventInThreadBaseProperties : AcsChatEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEventInThreadBaseProperties"/>. </summary>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="senderCommunicationIdentifier"/> is null. </exception>
-        internal AcsChatMessageEventInThreadBaseProperties(CommunicationIdentifierModel senderCommunicationIdentifier, DateTimeOffset composeTime)
-        {
-            Argument.AssertNotNull(senderCommunicationIdentifier, nameof(senderCommunicationIdentifier));
-
-            SenderCommunicationIdentifier = senderCommunicationIdentifier;
-            ComposeTime = composeTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEventInThreadBaseProperties"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        internal AcsChatMessageEventInThreadBaseProperties(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, CommunicationIdentifierModel senderCommunicationIdentifier, string senderDisplayName, DateTimeOffset composeTime, string type, long? version) : base(transactionId, threadId, serializedAdditionalRawData)
-        {
-            MessageId = messageId;
-            SenderCommunicationIdentifier = senderCommunicationIdentifier;
-            SenderDisplayName = senderDisplayName;
-            ComposeTime = composeTime;
-            Type = type;
-            Version = version;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageEventInThreadBaseProperties"/> for deserialization. </summary>
-        internal AcsChatMessageEventInThreadBaseProperties()
-        {
-        }
-
-        /// <summary> The chat message id. </summary>
-        public string MessageId { get; }
-        /// <summary> The communication identifier of the sender. </summary>
-        public CommunicationIdentifierModel SenderCommunicationIdentifier { get; }
-        /// <summary> The display name of the sender. </summary>
-        public string SenderDisplayName { get; }
-        /// <summary> The original compose time of the message. </summary>
-        public DateTimeOffset ComposeTime { get; }
-        /// <summary> The type of the message. </summary>
-        public string Type { get; }
-        /// <summary> The version of the message. </summary>
-        public long? Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedEventData.Serialization.cs
deleted file mode 100644
index 30ba40046cec..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedEventData.Serialization.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatMessageReceivedEventData : IUtf8JsonSerializable, IJsonModel<AcsChatMessageReceivedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatMessageReceivedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatMessageReceivedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageReceivedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(MessageBody))
-            {
-                writer.WritePropertyName("messageBody"u8);
-                writer.WriteStringValue(MessageBody);
-            }
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-        }
-
-        AcsChatMessageReceivedEventData IJsonModel<AcsChatMessageReceivedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageReceivedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatMessageReceivedEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatMessageReceivedEventData DeserializeAcsChatMessageReceivedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string messageBody = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            string messageId = default;
-            CommunicationIdentifierModel senderCommunicationIdentifier = default;
-            string senderDisplayName = default;
-            DateTimeOffset composeTime = default;
-            string type = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("messageBody"u8))
-                {
-                    messageBody = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("senderCommunicationIdentifier"u8))
-                {
-                    senderCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("senderDisplayName"u8))
-                {
-                    senderDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("composeTime"u8))
-                {
-                    composeTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatMessageReceivedEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                messageBody,
-                metadata);
-        }
-
-        BinaryData IPersistableModel<AcsChatMessageReceivedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageReceivedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatMessageReceivedEventData IPersistableModel<AcsChatMessageReceivedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatMessageReceivedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageReceivedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatMessageReceivedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatMessageReceivedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatMessageReceivedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedEventData.cs
deleted file mode 100644
index 2410db3e730b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedEventData.cs
+++ /dev/null
@@ -1,60 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatMessageReceived event. </summary>
-    public partial class AcsChatMessageReceivedEventData : AcsChatMessageEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageReceivedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/>, <paramref name="senderCommunicationIdentifier"/> or <paramref name="metadata"/> is null. </exception>
-        internal AcsChatMessageReceivedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, CommunicationIdentifierModel senderCommunicationIdentifier, DateTimeOffset composeTime, IReadOnlyDictionary<string, string> metadata) : base(recipientCommunicationIdentifier, senderCommunicationIdentifier, composeTime)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(senderCommunicationIdentifier, nameof(senderCommunicationIdentifier));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-
-            Metadata = metadata;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageReceivedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="messageBody"> The body of the chat message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        internal AcsChatMessageReceivedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, CommunicationIdentifierModel senderCommunicationIdentifier, string senderDisplayName, DateTimeOffset composeTime, string type, long? version, string messageBody, IReadOnlyDictionary<string, string> metadata) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData, messageId, senderCommunicationIdentifier, senderDisplayName, composeTime, type, version)
-        {
-            MessageBody = messageBody;
-            Metadata = metadata;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageReceivedEventData"/> for deserialization. </summary>
-        internal AcsChatMessageReceivedEventData()
-        {
-        }
-
-        /// <summary> The body of the chat message. </summary>
-        public string MessageBody { get; }
-        /// <summary> The chat message metadata. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedInThreadEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedInThreadEventData.Serialization.cs
deleted file mode 100644
index 03658d848d09..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedInThreadEventData.Serialization.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatMessageReceivedInThreadEventData : IUtf8JsonSerializable, IJsonModel<AcsChatMessageReceivedInThreadEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatMessageReceivedInThreadEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatMessageReceivedInThreadEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageReceivedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageReceivedInThreadEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(MessageBody))
-            {
-                writer.WritePropertyName("messageBody"u8);
-                writer.WriteStringValue(MessageBody);
-            }
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-        }
-
-        AcsChatMessageReceivedInThreadEventData IJsonModel<AcsChatMessageReceivedInThreadEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageReceivedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatMessageReceivedInThreadEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatMessageReceivedInThreadEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatMessageReceivedInThreadEventData DeserializeAcsChatMessageReceivedInThreadEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string messageBody = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            string messageId = default;
-            CommunicationIdentifierModel senderCommunicationIdentifier = default;
-            string senderDisplayName = default;
-            DateTimeOffset composeTime = default;
-            string type = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("messageBody"u8))
-                {
-                    messageBody = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("senderCommunicationIdentifier"u8))
-                {
-                    senderCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("senderDisplayName"u8))
-                {
-                    senderDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("composeTime"u8))
-                {
-                    composeTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatMessageReceivedInThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                messageBody,
-                metadata);
-        }
-
-        BinaryData IPersistableModel<AcsChatMessageReceivedInThreadEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageReceivedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageReceivedInThreadEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatMessageReceivedInThreadEventData IPersistableModel<AcsChatMessageReceivedInThreadEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatMessageReceivedInThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatMessageReceivedInThreadEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatMessageReceivedInThreadEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatMessageReceivedInThreadEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatMessageReceivedInThreadEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatMessageReceivedInThreadEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedInThreadEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedInThreadEventData.cs
deleted file mode 100644
index 8698284721c1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatMessageReceivedInThreadEventData.cs
+++ /dev/null
@@ -1,57 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatMessageReceivedInThread event. </summary>
-    public partial class AcsChatMessageReceivedInThreadEventData : AcsChatMessageEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageReceivedInThreadEventData"/>. </summary>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="senderCommunicationIdentifier"/> or <paramref name="metadata"/> is null. </exception>
-        internal AcsChatMessageReceivedInThreadEventData(CommunicationIdentifierModel senderCommunicationIdentifier, DateTimeOffset composeTime, IReadOnlyDictionary<string, string> metadata) : base(senderCommunicationIdentifier, composeTime)
-        {
-            Argument.AssertNotNull(senderCommunicationIdentifier, nameof(senderCommunicationIdentifier));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-
-            Metadata = metadata;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageReceivedInThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="messageBody"> The body of the chat message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        internal AcsChatMessageReceivedInThreadEventData(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, CommunicationIdentifierModel senderCommunicationIdentifier, string senderDisplayName, DateTimeOffset composeTime, string type, long? version, string messageBody, IReadOnlyDictionary<string, string> metadata) : base(transactionId, threadId, serializedAdditionalRawData, messageId, senderCommunicationIdentifier, senderDisplayName, composeTime, type, version)
-        {
-            MessageBody = messageBody;
-            Metadata = metadata;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatMessageReceivedInThreadEventData"/> for deserialization. </summary>
-        internal AcsChatMessageReceivedInThreadEventData()
-        {
-        }
-
-        /// <summary> The body of the chat message. </summary>
-        public string MessageBody { get; }
-        /// <summary> The chat message metadata. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadEventData.Serialization.cs
deleted file mode 100644
index 4acb68c7bf71..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadEventData.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatParticipantAddedToThreadEventData : IUtf8JsonSerializable, IJsonModel<AcsChatParticipantAddedToThreadEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatParticipantAddedToThreadEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatParticipantAddedToThreadEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantAddedToThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatParticipantAddedToThreadEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("time"u8);
-            writer.WriteStringValue(Time, "O");
-            writer.WritePropertyName("addedByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(AddedByCommunicationIdentifier, options);
-            writer.WritePropertyName("participantAdded"u8);
-            writer.WriteObjectValue(ParticipantAdded, options);
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteNumberValue(Version.Value);
-            }
-        }
-
-        AcsChatParticipantAddedToThreadEventData IJsonModel<AcsChatParticipantAddedToThreadEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantAddedToThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatParticipantAddedToThreadEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatParticipantAddedToThreadEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatParticipantAddedToThreadEventData DeserializeAcsChatParticipantAddedToThreadEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset time = default;
-            CommunicationIdentifierModel addedByCommunicationIdentifier = default;
-            AcsChatThreadParticipantProperties participantAdded = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("time"u8))
-                {
-                    time = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("addedByCommunicationIdentifier"u8))
-                {
-                    addedByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("participantAdded"u8))
-                {
-                    participantAdded = AcsChatThreadParticipantProperties.DeserializeAcsChatThreadParticipantProperties(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatParticipantAddedToThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                time,
-                addedByCommunicationIdentifier,
-                participantAdded,
-                version);
-        }
-
-        BinaryData IPersistableModel<AcsChatParticipantAddedToThreadEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantAddedToThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatParticipantAddedToThreadEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatParticipantAddedToThreadEventData IPersistableModel<AcsChatParticipantAddedToThreadEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantAddedToThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatParticipantAddedToThreadEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatParticipantAddedToThreadEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatParticipantAddedToThreadEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatParticipantAddedToThreadEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatParticipantAddedToThreadEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadEventData.cs
deleted file mode 100644
index 0c74e23af594..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadEventData.cs
+++ /dev/null
@@ -1,61 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatThreadParticipantAdded event. </summary>
-    public partial class AcsChatParticipantAddedToThreadEventData : AcsChatEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantAddedToThreadEventData"/>. </summary>
-        /// <param name="time"> The time at which the user was added to the thread. </param>
-        /// <param name="addedByCommunicationIdentifier"> The communication identifier of the user who added the user. </param>
-        /// <param name="participantAdded"> The details of the user who was added. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="addedByCommunicationIdentifier"/> or <paramref name="participantAdded"/> is null. </exception>
-        internal AcsChatParticipantAddedToThreadEventData(DateTimeOffset time, CommunicationIdentifierModel addedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantAdded)
-        {
-            Argument.AssertNotNull(addedByCommunicationIdentifier, nameof(addedByCommunicationIdentifier));
-            Argument.AssertNotNull(participantAdded, nameof(participantAdded));
-
-            Time = time;
-            AddedByCommunicationIdentifier = addedByCommunicationIdentifier;
-            ParticipantAdded = participantAdded;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantAddedToThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="time"> The time at which the user was added to the thread. </param>
-        /// <param name="addedByCommunicationIdentifier"> The communication identifier of the user who added the user. </param>
-        /// <param name="participantAdded"> The details of the user who was added. </param>
-        /// <param name="version"> The version of the thread. </param>
-        internal AcsChatParticipantAddedToThreadEventData(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset time, CommunicationIdentifierModel addedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantAdded, long? version) : base(transactionId, threadId, serializedAdditionalRawData)
-        {
-            Time = time;
-            AddedByCommunicationIdentifier = addedByCommunicationIdentifier;
-            ParticipantAdded = participantAdded;
-            Version = version;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantAddedToThreadEventData"/> for deserialization. </summary>
-        internal AcsChatParticipantAddedToThreadEventData()
-        {
-        }
-
-        /// <summary> The time at which the user was added to the thread. </summary>
-        public DateTimeOffset Time { get; }
-        /// <summary> The communication identifier of the user who added the user. </summary>
-        public CommunicationIdentifierModel AddedByCommunicationIdentifier { get; }
-        /// <summary> The details of the user who was added. </summary>
-        public AcsChatThreadParticipantProperties ParticipantAdded { get; }
-        /// <summary> The version of the thread. </summary>
-        public long? Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadWithUserEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadWithUserEventData.Serialization.cs
deleted file mode 100644
index 656b0ad7865b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadWithUserEventData.Serialization.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatParticipantAddedToThreadWithUserEventData : IUtf8JsonSerializable, IJsonModel<AcsChatParticipantAddedToThreadWithUserEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatParticipantAddedToThreadWithUserEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatParticipantAddedToThreadWithUserEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantAddedToThreadWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatParticipantAddedToThreadWithUserEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("time"u8);
-            writer.WriteStringValue(Time, "O");
-            writer.WritePropertyName("addedByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(AddedByCommunicationIdentifier, options);
-            writer.WritePropertyName("participantAdded"u8);
-            writer.WriteObjectValue(ParticipantAdded, options);
-        }
-
-        AcsChatParticipantAddedToThreadWithUserEventData IJsonModel<AcsChatParticipantAddedToThreadWithUserEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantAddedToThreadWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatParticipantAddedToThreadWithUserEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatParticipantAddedToThreadWithUserEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatParticipantAddedToThreadWithUserEventData DeserializeAcsChatParticipantAddedToThreadWithUserEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset time = default;
-            CommunicationIdentifierModel addedByCommunicationIdentifier = default;
-            AcsChatThreadParticipantProperties participantAdded = default;
-            DateTimeOffset createTime = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("time"u8))
-                {
-                    time = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("addedByCommunicationIdentifier"u8))
-                {
-                    addedByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("participantAdded"u8))
-                {
-                    participantAdded = AcsChatThreadParticipantProperties.DeserializeAcsChatThreadParticipantProperties(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatParticipantAddedToThreadWithUserEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version,
-                time,
-                addedByCommunicationIdentifier,
-                participantAdded);
-        }
-
-        BinaryData IPersistableModel<AcsChatParticipantAddedToThreadWithUserEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantAddedToThreadWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatParticipantAddedToThreadWithUserEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatParticipantAddedToThreadWithUserEventData IPersistableModel<AcsChatParticipantAddedToThreadWithUserEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantAddedToThreadWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatParticipantAddedToThreadWithUserEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatParticipantAddedToThreadWithUserEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatParticipantAddedToThreadWithUserEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatParticipantAddedToThreadWithUserEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatParticipantAddedToThreadWithUserEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadWithUserEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadWithUserEventData.cs
deleted file mode 100644
index 95e15aab1526..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantAddedToThreadWithUserEventData.cs
+++ /dev/null
@@ -1,63 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatParticipantAddedToThreadWithUser event. </summary>
-    public partial class AcsChatParticipantAddedToThreadWithUserEventData : AcsChatThreadEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantAddedToThreadWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="time"> The time at which the user was added to the thread. </param>
-        /// <param name="addedByCommunicationIdentifier"> The communication identifier of the user who added the user. </param>
-        /// <param name="participantAdded"> The details of the user who was added. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/>, <paramref name="addedByCommunicationIdentifier"/> or <paramref name="participantAdded"/> is null. </exception>
-        internal AcsChatParticipantAddedToThreadWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, DateTimeOffset createTime, DateTimeOffset time, CommunicationIdentifierModel addedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantAdded) : base(recipientCommunicationIdentifier, createTime)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(addedByCommunicationIdentifier, nameof(addedByCommunicationIdentifier));
-            Argument.AssertNotNull(participantAdded, nameof(participantAdded));
-
-            Time = time;
-            AddedByCommunicationIdentifier = addedByCommunicationIdentifier;
-            ParticipantAdded = participantAdded;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantAddedToThreadWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="time"> The time at which the user was added to the thread. </param>
-        /// <param name="addedByCommunicationIdentifier"> The communication identifier of the user who added the user. </param>
-        /// <param name="participantAdded"> The details of the user who was added. </param>
-        internal AcsChatParticipantAddedToThreadWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version, DateTimeOffset time, CommunicationIdentifierModel addedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantAdded) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData, createTime, version)
-        {
-            Time = time;
-            AddedByCommunicationIdentifier = addedByCommunicationIdentifier;
-            ParticipantAdded = participantAdded;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantAddedToThreadWithUserEventData"/> for deserialization. </summary>
-        internal AcsChatParticipantAddedToThreadWithUserEventData()
-        {
-        }
-
-        /// <summary> The time at which the user was added to the thread. </summary>
-        public DateTimeOffset Time { get; }
-        /// <summary> The communication identifier of the user who added the user. </summary>
-        public CommunicationIdentifierModel AddedByCommunicationIdentifier { get; }
-        /// <summary> The details of the user who was added. </summary>
-        public AcsChatThreadParticipantProperties ParticipantAdded { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadEventData.Serialization.cs
deleted file mode 100644
index 34a1f1d8e6bd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadEventData.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatParticipantRemovedFromThreadEventData : IUtf8JsonSerializable, IJsonModel<AcsChatParticipantRemovedFromThreadEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatParticipantRemovedFromThreadEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatParticipantRemovedFromThreadEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantRemovedFromThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatParticipantRemovedFromThreadEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("time"u8);
-            writer.WriteStringValue(Time, "O");
-            writer.WritePropertyName("removedByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(RemovedByCommunicationIdentifier, options);
-            writer.WritePropertyName("participantRemoved"u8);
-            writer.WriteObjectValue(ParticipantRemoved, options);
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteNumberValue(Version.Value);
-            }
-        }
-
-        AcsChatParticipantRemovedFromThreadEventData IJsonModel<AcsChatParticipantRemovedFromThreadEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantRemovedFromThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatParticipantRemovedFromThreadEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatParticipantRemovedFromThreadEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatParticipantRemovedFromThreadEventData DeserializeAcsChatParticipantRemovedFromThreadEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset time = default;
-            CommunicationIdentifierModel removedByCommunicationIdentifier = default;
-            AcsChatThreadParticipantProperties participantRemoved = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("time"u8))
-                {
-                    time = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("removedByCommunicationIdentifier"u8))
-                {
-                    removedByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("participantRemoved"u8))
-                {
-                    participantRemoved = AcsChatThreadParticipantProperties.DeserializeAcsChatThreadParticipantProperties(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatParticipantRemovedFromThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                time,
-                removedByCommunicationIdentifier,
-                participantRemoved,
-                version);
-        }
-
-        BinaryData IPersistableModel<AcsChatParticipantRemovedFromThreadEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantRemovedFromThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatParticipantRemovedFromThreadEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatParticipantRemovedFromThreadEventData IPersistableModel<AcsChatParticipantRemovedFromThreadEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantRemovedFromThreadEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatParticipantRemovedFromThreadEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatParticipantRemovedFromThreadEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatParticipantRemovedFromThreadEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatParticipantRemovedFromThreadEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatParticipantRemovedFromThreadEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadEventData.cs
deleted file mode 100644
index 2984453d0a26..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadEventData.cs
+++ /dev/null
@@ -1,61 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatThreadParticipantRemoved event. </summary>
-    public partial class AcsChatParticipantRemovedFromThreadEventData : AcsChatEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantRemovedFromThreadEventData"/>. </summary>
-        /// <param name="time"> The time at which the user was removed to the thread. </param>
-        /// <param name="removedByCommunicationIdentifier"> The communication identifier of the user who removed the user. </param>
-        /// <param name="participantRemoved"> The details of the user who was removed. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="removedByCommunicationIdentifier"/> or <paramref name="participantRemoved"/> is null. </exception>
-        internal AcsChatParticipantRemovedFromThreadEventData(DateTimeOffset time, CommunicationIdentifierModel removedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantRemoved)
-        {
-            Argument.AssertNotNull(removedByCommunicationIdentifier, nameof(removedByCommunicationIdentifier));
-            Argument.AssertNotNull(participantRemoved, nameof(participantRemoved));
-
-            Time = time;
-            RemovedByCommunicationIdentifier = removedByCommunicationIdentifier;
-            ParticipantRemoved = participantRemoved;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantRemovedFromThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="time"> The time at which the user was removed to the thread. </param>
-        /// <param name="removedByCommunicationIdentifier"> The communication identifier of the user who removed the user. </param>
-        /// <param name="participantRemoved"> The details of the user who was removed. </param>
-        /// <param name="version"> The version of the thread. </param>
-        internal AcsChatParticipantRemovedFromThreadEventData(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset time, CommunicationIdentifierModel removedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantRemoved, long? version) : base(transactionId, threadId, serializedAdditionalRawData)
-        {
-            Time = time;
-            RemovedByCommunicationIdentifier = removedByCommunicationIdentifier;
-            ParticipantRemoved = participantRemoved;
-            Version = version;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantRemovedFromThreadEventData"/> for deserialization. </summary>
-        internal AcsChatParticipantRemovedFromThreadEventData()
-        {
-        }
-
-        /// <summary> The time at which the user was removed to the thread. </summary>
-        public DateTimeOffset Time { get; }
-        /// <summary> The communication identifier of the user who removed the user. </summary>
-        public CommunicationIdentifierModel RemovedByCommunicationIdentifier { get; }
-        /// <summary> The details of the user who was removed. </summary>
-        public AcsChatThreadParticipantProperties ParticipantRemoved { get; }
-        /// <summary> The version of the thread. </summary>
-        public long? Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadWithUserEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadWithUserEventData.Serialization.cs
deleted file mode 100644
index f7db6f14d6f8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadWithUserEventData.Serialization.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatParticipantRemovedFromThreadWithUserEventData : IUtf8JsonSerializable, IJsonModel<AcsChatParticipantRemovedFromThreadWithUserEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatParticipantRemovedFromThreadWithUserEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatParticipantRemovedFromThreadWithUserEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantRemovedFromThreadWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatParticipantRemovedFromThreadWithUserEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("time"u8);
-            writer.WriteStringValue(Time, "O");
-            writer.WritePropertyName("removedByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(RemovedByCommunicationIdentifier, options);
-            writer.WritePropertyName("participantRemoved"u8);
-            writer.WriteObjectValue(ParticipantRemoved, options);
-        }
-
-        AcsChatParticipantRemovedFromThreadWithUserEventData IJsonModel<AcsChatParticipantRemovedFromThreadWithUserEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantRemovedFromThreadWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatParticipantRemovedFromThreadWithUserEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatParticipantRemovedFromThreadWithUserEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatParticipantRemovedFromThreadWithUserEventData DeserializeAcsChatParticipantRemovedFromThreadWithUserEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset time = default;
-            CommunicationIdentifierModel removedByCommunicationIdentifier = default;
-            AcsChatThreadParticipantProperties participantRemoved = default;
-            DateTimeOffset createTime = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("time"u8))
-                {
-                    time = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("removedByCommunicationIdentifier"u8))
-                {
-                    removedByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("participantRemoved"u8))
-                {
-                    participantRemoved = AcsChatThreadParticipantProperties.DeserializeAcsChatThreadParticipantProperties(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatParticipantRemovedFromThreadWithUserEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version,
-                time,
-                removedByCommunicationIdentifier,
-                participantRemoved);
-        }
-
-        BinaryData IPersistableModel<AcsChatParticipantRemovedFromThreadWithUserEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantRemovedFromThreadWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatParticipantRemovedFromThreadWithUserEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatParticipantRemovedFromThreadWithUserEventData IPersistableModel<AcsChatParticipantRemovedFromThreadWithUserEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatParticipantRemovedFromThreadWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatParticipantRemovedFromThreadWithUserEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatParticipantRemovedFromThreadWithUserEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatParticipantRemovedFromThreadWithUserEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatParticipantRemovedFromThreadWithUserEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatParticipantRemovedFromThreadWithUserEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadWithUserEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadWithUserEventData.cs
deleted file mode 100644
index 109684ffc523..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatParticipantRemovedFromThreadWithUserEventData.cs
+++ /dev/null
@@ -1,63 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatParticipantRemovedFromThreadWithUser event. </summary>
-    public partial class AcsChatParticipantRemovedFromThreadWithUserEventData : AcsChatThreadEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantRemovedFromThreadWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="time"> The time at which the user was removed to the thread. </param>
-        /// <param name="removedByCommunicationIdentifier"> The communication identifier of the user who removed the user. </param>
-        /// <param name="participantRemoved"> The details of the user who was removed. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/>, <paramref name="removedByCommunicationIdentifier"/> or <paramref name="participantRemoved"/> is null. </exception>
-        internal AcsChatParticipantRemovedFromThreadWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, DateTimeOffset createTime, DateTimeOffset time, CommunicationIdentifierModel removedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantRemoved) : base(recipientCommunicationIdentifier, createTime)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(removedByCommunicationIdentifier, nameof(removedByCommunicationIdentifier));
-            Argument.AssertNotNull(participantRemoved, nameof(participantRemoved));
-
-            Time = time;
-            RemovedByCommunicationIdentifier = removedByCommunicationIdentifier;
-            ParticipantRemoved = participantRemoved;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantRemovedFromThreadWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="time"> The time at which the user was removed to the thread. </param>
-        /// <param name="removedByCommunicationIdentifier"> The communication identifier of the user who removed the user. </param>
-        /// <param name="participantRemoved"> The details of the user who was removed. </param>
-        internal AcsChatParticipantRemovedFromThreadWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version, DateTimeOffset time, CommunicationIdentifierModel removedByCommunicationIdentifier, AcsChatThreadParticipantProperties participantRemoved) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData, createTime, version)
-        {
-            Time = time;
-            RemovedByCommunicationIdentifier = removedByCommunicationIdentifier;
-            ParticipantRemoved = participantRemoved;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatParticipantRemovedFromThreadWithUserEventData"/> for deserialization. </summary>
-        internal AcsChatParticipantRemovedFromThreadWithUserEventData()
-        {
-        }
-
-        /// <summary> The time at which the user was removed to the thread. </summary>
-        public DateTimeOffset Time { get; }
-        /// <summary> The communication identifier of the user who removed the user. </summary>
-        public CommunicationIdentifierModel RemovedByCommunicationIdentifier { get; }
-        /// <summary> The details of the user who was removed. </summary>
-        public AcsChatThreadParticipantProperties ParticipantRemoved { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedEventData.Serialization.cs
deleted file mode 100644
index 660520158e5d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadCreatedEventData : IUtf8JsonSerializable, IJsonModel<AcsChatThreadCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("createdByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(CreatedByCommunicationIdentifier, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            foreach (var item in Properties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("participants"u8);
-            writer.WriteStartArray();
-            foreach (var item in Participants)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        AcsChatThreadCreatedEventData IJsonModel<AcsChatThreadCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadCreatedEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadCreatedEventData DeserializeAcsChatThreadCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel createdByCommunicationIdentifier = default;
-            IReadOnlyDictionary<string, BinaryData> properties = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            IReadOnlyList<AcsChatThreadParticipantProperties> participants = default;
-            DateTimeOffset createTime = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("createdByCommunicationIdentifier"u8))
-                {
-                    createdByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    properties = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("participants"u8))
-                {
-                    List<AcsChatThreadParticipantProperties> array = new List<AcsChatThreadParticipantProperties>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsChatThreadParticipantProperties.DeserializeAcsChatThreadParticipantProperties(item, options));
-                    }
-                    participants = array;
-                    continue;
-                }
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadCreatedEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version,
-                createdByCommunicationIdentifier,
-                properties,
-                metadata,
-                participants);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadCreatedEventData IPersistableModel<AcsChatThreadCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatThreadCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedEventData.cs
deleted file mode 100644
index 30a77e8200e9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedEventData.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatThreadCreated event. </summary>
-    public partial class AcsChatThreadCreatedEventData : AcsChatThreadEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadCreatedEventData"/>. </summary>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="createdByCommunicationIdentifier"> The communication identifier of the user who created the thread. </param>
-        /// <param name="properties"> The thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="participants"> The list of properties of participants who are part of the thread. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="createdByCommunicationIdentifier"/>, <paramref name="properties"/>, <paramref name="metadata"/> or <paramref name="participants"/> is null. </exception>
-        internal AcsChatThreadCreatedEventData(DateTimeOffset createTime, CommunicationIdentifierModel createdByCommunicationIdentifier, IReadOnlyDictionary<string, BinaryData> properties, IReadOnlyDictionary<string, string> metadata, IEnumerable<AcsChatThreadParticipantProperties> participants) : base(createTime)
-        {
-            Argument.AssertNotNull(createdByCommunicationIdentifier, nameof(createdByCommunicationIdentifier));
-            Argument.AssertNotNull(properties, nameof(properties));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-            Argument.AssertNotNull(participants, nameof(participants));
-
-            CreatedByCommunicationIdentifier = createdByCommunicationIdentifier;
-            Properties = properties;
-            Metadata = metadata;
-            Participants = participants.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadCreatedEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="createdByCommunicationIdentifier"> The communication identifier of the user who created the thread. </param>
-        /// <param name="properties"> The thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="participants"> The list of properties of participants who are part of the thread. </param>
-        internal AcsChatThreadCreatedEventData(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version, CommunicationIdentifierModel createdByCommunicationIdentifier, IReadOnlyDictionary<string, BinaryData> properties, IReadOnlyDictionary<string, string> metadata, IReadOnlyList<AcsChatThreadParticipantProperties> participants) : base(transactionId, threadId, serializedAdditionalRawData, createTime, version)
-        {
-            CreatedByCommunicationIdentifier = createdByCommunicationIdentifier;
-            Properties = properties;
-            Metadata = metadata;
-            Participants = participants;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadCreatedEventData"/> for deserialization. </summary>
-        internal AcsChatThreadCreatedEventData()
-        {
-        }
-
-        /// <summary> The communication identifier of the user who created the thread. </summary>
-        public CommunicationIdentifierModel CreatedByCommunicationIdentifier { get; }
-        /// <summary>
-        /// The thread properties
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> Properties { get; }
-        /// <summary> The thread metadata. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-        /// <summary> The list of properties of participants who are part of the thread. </summary>
-        public IReadOnlyList<AcsChatThreadParticipantProperties> Participants { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedWithUserEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedWithUserEventData.Serialization.cs
deleted file mode 100644
index 096a08aa546a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedWithUserEventData.Serialization.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadCreatedWithUserEventData : IUtf8JsonSerializable, IJsonModel<AcsChatThreadCreatedWithUserEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadCreatedWithUserEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadCreatedWithUserEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadCreatedWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadCreatedWithUserEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("createdByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(CreatedByCommunicationIdentifier, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            foreach (var item in Properties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("participants"u8);
-            writer.WriteStartArray();
-            foreach (var item in Participants)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        AcsChatThreadCreatedWithUserEventData IJsonModel<AcsChatThreadCreatedWithUserEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadCreatedWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadCreatedWithUserEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadCreatedWithUserEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadCreatedWithUserEventData DeserializeAcsChatThreadCreatedWithUserEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel createdByCommunicationIdentifier = default;
-            IReadOnlyDictionary<string, BinaryData> properties = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            IReadOnlyList<AcsChatThreadParticipantProperties> participants = default;
-            DateTimeOffset createTime = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("createdByCommunicationIdentifier"u8))
-                {
-                    createdByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    properties = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("participants"u8))
-                {
-                    List<AcsChatThreadParticipantProperties> array = new List<AcsChatThreadParticipantProperties>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsChatThreadParticipantProperties.DeserializeAcsChatThreadParticipantProperties(item, options));
-                    }
-                    participants = array;
-                    continue;
-                }
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadCreatedWithUserEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version,
-                createdByCommunicationIdentifier,
-                properties,
-                metadata,
-                participants);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadCreatedWithUserEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadCreatedWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadCreatedWithUserEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadCreatedWithUserEventData IPersistableModel<AcsChatThreadCreatedWithUserEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadCreatedWithUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadCreatedWithUserEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadCreatedWithUserEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadCreatedWithUserEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatThreadCreatedWithUserEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadCreatedWithUserEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedWithUserEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedWithUserEventData.cs
deleted file mode 100644
index 1016b59134b6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadCreatedWithUserEventData.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatThreadCreatedWithUser event. </summary>
-    public partial class AcsChatThreadCreatedWithUserEventData : AcsChatThreadEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadCreatedWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="createdByCommunicationIdentifier"> The communication identifier of the user who created the thread. </param>
-        /// <param name="properties"> The thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="participants"> The list of properties of participants who are part of the thread. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/>, <paramref name="createdByCommunicationIdentifier"/>, <paramref name="properties"/>, <paramref name="metadata"/> or <paramref name="participants"/> is null. </exception>
-        internal AcsChatThreadCreatedWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, DateTimeOffset createTime, CommunicationIdentifierModel createdByCommunicationIdentifier, IReadOnlyDictionary<string, BinaryData> properties, IReadOnlyDictionary<string, string> metadata, IEnumerable<AcsChatThreadParticipantProperties> participants) : base(recipientCommunicationIdentifier, createTime)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(createdByCommunicationIdentifier, nameof(createdByCommunicationIdentifier));
-            Argument.AssertNotNull(properties, nameof(properties));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-            Argument.AssertNotNull(participants, nameof(participants));
-
-            CreatedByCommunicationIdentifier = createdByCommunicationIdentifier;
-            Properties = properties;
-            Metadata = metadata;
-            Participants = participants.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadCreatedWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="createdByCommunicationIdentifier"> The communication identifier of the user who created the thread. </param>
-        /// <param name="properties"> The thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="participants"> The list of properties of participants who are part of the thread. </param>
-        internal AcsChatThreadCreatedWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version, CommunicationIdentifierModel createdByCommunicationIdentifier, IReadOnlyDictionary<string, BinaryData> properties, IReadOnlyDictionary<string, string> metadata, IReadOnlyList<AcsChatThreadParticipantProperties> participants) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData, createTime, version)
-        {
-            CreatedByCommunicationIdentifier = createdByCommunicationIdentifier;
-            Properties = properties;
-            Metadata = metadata;
-            Participants = participants;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadCreatedWithUserEventData"/> for deserialization. </summary>
-        internal AcsChatThreadCreatedWithUserEventData()
-        {
-        }
-
-        /// <summary> The communication identifier of the user who created the thread. </summary>
-        public CommunicationIdentifierModel CreatedByCommunicationIdentifier { get; }
-        /// <summary>
-        /// The thread properties
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> Properties { get; }
-        /// <summary> The thread metadata. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-        /// <summary> The list of properties of participants who are part of the thread. </summary>
-        public IReadOnlyList<AcsChatThreadParticipantProperties> Participants { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadDeletedEventData.Serialization.cs
deleted file mode 100644
index 8b2f2a7db481..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadDeletedEventData : IUtf8JsonSerializable, IJsonModel<AcsChatThreadDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("deletedByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(DeletedByCommunicationIdentifier, options);
-            writer.WritePropertyName("deleteTime"u8);
-            writer.WriteStringValue(DeleteTime, "O");
-        }
-
-        AcsChatThreadDeletedEventData IJsonModel<AcsChatThreadDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadDeletedEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadDeletedEventData DeserializeAcsChatThreadDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel deletedByCommunicationIdentifier = default;
-            DateTimeOffset deleteTime = default;
-            DateTimeOffset createTime = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deletedByCommunicationIdentifier"u8))
-                {
-                    deletedByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("deleteTime"u8))
-                {
-                    deleteTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadDeletedEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version,
-                deletedByCommunicationIdentifier,
-                deleteTime);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadDeletedEventData IPersistableModel<AcsChatThreadDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatThreadDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadDeletedEventData.cs
deleted file mode 100644
index 68b39610ce9d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadDeletedEventData.cs
+++ /dev/null
@@ -1,53 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatThreadDeleted event. </summary>
-    public partial class AcsChatThreadDeletedEventData : AcsChatThreadEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadDeletedEventData"/>. </summary>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="deletedByCommunicationIdentifier"> The communication identifier of the user who deleted the thread. </param>
-        /// <param name="deleteTime"> The deletion time of the thread. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="deletedByCommunicationIdentifier"/> is null. </exception>
-        internal AcsChatThreadDeletedEventData(DateTimeOffset createTime, CommunicationIdentifierModel deletedByCommunicationIdentifier, DateTimeOffset deleteTime) : base(createTime)
-        {
-            Argument.AssertNotNull(deletedByCommunicationIdentifier, nameof(deletedByCommunicationIdentifier));
-
-            DeletedByCommunicationIdentifier = deletedByCommunicationIdentifier;
-            DeleteTime = deleteTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadDeletedEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="deletedByCommunicationIdentifier"> The communication identifier of the user who deleted the thread. </param>
-        /// <param name="deleteTime"> The deletion time of the thread. </param>
-        internal AcsChatThreadDeletedEventData(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version, CommunicationIdentifierModel deletedByCommunicationIdentifier, DateTimeOffset deleteTime) : base(transactionId, threadId, serializedAdditionalRawData, createTime, version)
-        {
-            DeletedByCommunicationIdentifier = deletedByCommunicationIdentifier;
-            DeleteTime = deleteTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadDeletedEventData"/> for deserialization. </summary>
-        internal AcsChatThreadDeletedEventData()
-        {
-        }
-
-        /// <summary> The communication identifier of the user who deleted the thread. </summary>
-        public CommunicationIdentifierModel DeletedByCommunicationIdentifier { get; }
-        /// <summary> The deletion time of the thread. </summary>
-        public DateTimeOffset DeleteTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventBaseProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventBaseProperties.Serialization.cs
deleted file mode 100644
index dbc9bad2c0fe..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventBaseProperties.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadEventBaseProperties : IUtf8JsonSerializable, IJsonModel<AcsChatThreadEventBaseProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadEventBaseProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadEventBaseProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadEventBaseProperties)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("createTime"u8);
-            writer.WriteStringValue(CreateTime, "O");
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteNumberValue(Version.Value);
-            }
-        }
-
-        AcsChatThreadEventBaseProperties IJsonModel<AcsChatThreadEventBaseProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadEventBaseProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadEventBaseProperties(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadEventBaseProperties DeserializeAcsChatThreadEventBaseProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset createTime = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadEventBaseProperties(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadEventBaseProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadEventBaseProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadEventBaseProperties IPersistableModel<AcsChatThreadEventBaseProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadEventBaseProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadEventBaseProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadEventBaseProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatThreadEventBaseProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadEventBaseProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventBaseProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventBaseProperties.cs
deleted file mode 100644
index d2a25d81594d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventBaseProperties.cs
+++ /dev/null
@@ -1,50 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all chat thread events. </summary>
-    public partial class AcsChatThreadEventBaseProperties : AcsChatEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/> is null. </exception>
-        internal AcsChatThreadEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier, DateTimeOffset createTime) : base(recipientCommunicationIdentifier)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-
-            CreateTime = createTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        internal AcsChatThreadEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData)
-        {
-            CreateTime = createTime;
-            Version = version;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadEventBaseProperties"/> for deserialization. </summary>
-        internal AcsChatThreadEventBaseProperties()
-        {
-        }
-
-        /// <summary> The original creation time of the thread. </summary>
-        public DateTimeOffset CreateTime { get; }
-        /// <summary> The version of the thread. </summary>
-        public long? Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventInThreadBaseProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventInThreadBaseProperties.Serialization.cs
deleted file mode 100644
index c6a84493d388..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventInThreadBaseProperties.Serialization.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadEventInThreadBaseProperties : IUtf8JsonSerializable, IJsonModel<AcsChatThreadEventInThreadBaseProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadEventInThreadBaseProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadEventInThreadBaseProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadEventInThreadBaseProperties)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("createTime"u8);
-            writer.WriteStringValue(CreateTime, "O");
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteNumberValue(Version.Value);
-            }
-        }
-
-        AcsChatThreadEventInThreadBaseProperties IJsonModel<AcsChatThreadEventInThreadBaseProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadEventInThreadBaseProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadEventInThreadBaseProperties(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadEventInThreadBaseProperties DeserializeAcsChatThreadEventInThreadBaseProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset createTime = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadEventInThreadBaseProperties(transactionId, threadId, serializedAdditionalRawData, createTime, version);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadEventInThreadBaseProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadEventInThreadBaseProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadEventInThreadBaseProperties IPersistableModel<AcsChatThreadEventInThreadBaseProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadEventInThreadBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadEventInThreadBaseProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadEventInThreadBaseProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadEventInThreadBaseProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatThreadEventInThreadBaseProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadEventInThreadBaseProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventInThreadBaseProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventInThreadBaseProperties.cs
deleted file mode 100644
index 6f41f0fe85ee..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadEventInThreadBaseProperties.cs
+++ /dev/null
@@ -1,45 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all chat thread events. </summary>
-    public partial class AcsChatThreadEventInThreadBaseProperties : AcsChatEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadEventInThreadBaseProperties"/>. </summary>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        internal AcsChatThreadEventInThreadBaseProperties(DateTimeOffset createTime)
-        {
-            CreateTime = createTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadEventInThreadBaseProperties"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        internal AcsChatThreadEventInThreadBaseProperties(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version) : base(transactionId, threadId, serializedAdditionalRawData)
-        {
-            CreateTime = createTime;
-            Version = version;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadEventInThreadBaseProperties"/> for deserialization. </summary>
-        internal AcsChatThreadEventInThreadBaseProperties()
-        {
-        }
-
-        /// <summary> The original creation time of the thread. </summary>
-        public DateTimeOffset CreateTime { get; }
-        /// <summary> The version of the thread. </summary>
-        public long? Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadParticipantProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadParticipantProperties.Serialization.cs
deleted file mode 100644
index a1c77c4bfd43..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadParticipantProperties.Serialization.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadParticipantProperties : IUtf8JsonSerializable, IJsonModel<AcsChatThreadParticipantProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadParticipantProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadParticipantProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadParticipantProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadParticipantProperties)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(DisplayName))
-            {
-                writer.WritePropertyName("displayName"u8);
-                writer.WriteStringValue(DisplayName);
-            }
-            writer.WritePropertyName("participantCommunicationIdentifier"u8);
-            writer.WriteObjectValue(ParticipantCommunicationIdentifier, options);
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsChatThreadParticipantProperties IJsonModel<AcsChatThreadParticipantProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadParticipantProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadParticipantProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadParticipantProperties(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadParticipantProperties DeserializeAcsChatThreadParticipantProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string displayName = default;
-            CommunicationIdentifierModel participantCommunicationIdentifier = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("displayName"u8))
-                {
-                    displayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("participantCommunicationIdentifier"u8))
-                {
-                    participantCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadParticipantProperties(displayName, participantCommunicationIdentifier, metadata, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadParticipantProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadParticipantProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadParticipantProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadParticipantProperties IPersistableModel<AcsChatThreadParticipantProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadParticipantProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadParticipantProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadParticipantProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadParticipantProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsChatThreadParticipantProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadParticipantProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadParticipantProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadParticipantProperties.cs
deleted file mode 100644
index 5fae54aff8c5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadParticipantProperties.cs
+++ /dev/null
@@ -1,86 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the chat thread participant. </summary>
-    public partial class AcsChatThreadParticipantProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadParticipantProperties"/>. </summary>
-        /// <param name="participantCommunicationIdentifier"> The communication identifier of the user. </param>
-        /// <param name="metadata"> The metadata of the user. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="participantCommunicationIdentifier"/> or <paramref name="metadata"/> is null. </exception>
-        internal AcsChatThreadParticipantProperties(CommunicationIdentifierModel participantCommunicationIdentifier, IReadOnlyDictionary<string, string> metadata)
-        {
-            Argument.AssertNotNull(participantCommunicationIdentifier, nameof(participantCommunicationIdentifier));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-
-            ParticipantCommunicationIdentifier = participantCommunicationIdentifier;
-            Metadata = metadata;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadParticipantProperties"/>. </summary>
-        /// <param name="displayName"> The name of the user. </param>
-        /// <param name="participantCommunicationIdentifier"> The communication identifier of the user. </param>
-        /// <param name="metadata"> The metadata of the user. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsChatThreadParticipantProperties(string displayName, CommunicationIdentifierModel participantCommunicationIdentifier, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            DisplayName = displayName;
-            ParticipantCommunicationIdentifier = participantCommunicationIdentifier;
-            Metadata = metadata;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadParticipantProperties"/> for deserialization. </summary>
-        internal AcsChatThreadParticipantProperties()
-        {
-        }
-
-        /// <summary> The name of the user. </summary>
-        public string DisplayName { get; }
-        /// <summary> The communication identifier of the user. </summary>
-        public CommunicationIdentifierModel ParticipantCommunicationIdentifier { get; }
-        /// <summary> The metadata of the user. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedEventData.Serialization.cs
deleted file mode 100644
index 1b26923f5d7d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadPropertiesUpdatedEventData : IUtf8JsonSerializable, IJsonModel<AcsChatThreadPropertiesUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadPropertiesUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadPropertiesUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadPropertiesUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadPropertiesUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("editedByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(EditedByCommunicationIdentifier, options);
-            writer.WritePropertyName("editTime"u8);
-            writer.WriteStringValue(EditTime, "O");
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            foreach (var item in Properties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-        }
-
-        AcsChatThreadPropertiesUpdatedEventData IJsonModel<AcsChatThreadPropertiesUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadPropertiesUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadPropertiesUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadPropertiesUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadPropertiesUpdatedEventData DeserializeAcsChatThreadPropertiesUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel editedByCommunicationIdentifier = default;
-            DateTimeOffset editTime = default;
-            IReadOnlyDictionary<string, BinaryData> properties = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            DateTimeOffset createTime = default;
-            long? version = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("editedByCommunicationIdentifier"u8))
-                {
-                    editedByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("editTime"u8))
-                {
-                    editTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    properties = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadPropertiesUpdatedEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version,
-                editedByCommunicationIdentifier,
-                editTime,
-                properties,
-                metadata);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadPropertiesUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadPropertiesUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadPropertiesUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadPropertiesUpdatedEventData IPersistableModel<AcsChatThreadPropertiesUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadPropertiesUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadPropertiesUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadPropertiesUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadPropertiesUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatThreadPropertiesUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadPropertiesUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedEventData.cs
deleted file mode 100644
index 44f774f4f9a4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedEventData.cs
+++ /dev/null
@@ -1,96 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatThreadPropertiesUpdated event. </summary>
-    public partial class AcsChatThreadPropertiesUpdatedEventData : AcsChatThreadEventInThreadBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadPropertiesUpdatedEventData"/>. </summary>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="editedByCommunicationIdentifier"> The communication identifier of the user who updated the thread properties. </param>
-        /// <param name="editTime"> The time at which the properties of the thread were updated. </param>
-        /// <param name="properties"> The updated thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="editedByCommunicationIdentifier"/>, <paramref name="properties"/> or <paramref name="metadata"/> is null. </exception>
-        internal AcsChatThreadPropertiesUpdatedEventData(DateTimeOffset createTime, CommunicationIdentifierModel editedByCommunicationIdentifier, DateTimeOffset editTime, IReadOnlyDictionary<string, BinaryData> properties, IReadOnlyDictionary<string, string> metadata) : base(createTime)
-        {
-            Argument.AssertNotNull(editedByCommunicationIdentifier, nameof(editedByCommunicationIdentifier));
-            Argument.AssertNotNull(properties, nameof(properties));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-
-            EditedByCommunicationIdentifier = editedByCommunicationIdentifier;
-            EditTime = editTime;
-            Properties = properties;
-            Metadata = metadata;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadPropertiesUpdatedEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="editedByCommunicationIdentifier"> The communication identifier of the user who updated the thread properties. </param>
-        /// <param name="editTime"> The time at which the properties of the thread were updated. </param>
-        /// <param name="properties"> The updated thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        internal AcsChatThreadPropertiesUpdatedEventData(string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version, CommunicationIdentifierModel editedByCommunicationIdentifier, DateTimeOffset editTime, IReadOnlyDictionary<string, BinaryData> properties, IReadOnlyDictionary<string, string> metadata) : base(transactionId, threadId, serializedAdditionalRawData, createTime, version)
-        {
-            EditedByCommunicationIdentifier = editedByCommunicationIdentifier;
-            EditTime = editTime;
-            Properties = properties;
-            Metadata = metadata;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadPropertiesUpdatedEventData"/> for deserialization. </summary>
-        internal AcsChatThreadPropertiesUpdatedEventData()
-        {
-        }
-
-        /// <summary> The communication identifier of the user who updated the thread properties. </summary>
-        public CommunicationIdentifierModel EditedByCommunicationIdentifier { get; }
-        /// <summary> The time at which the properties of the thread were updated. </summary>
-        public DateTimeOffset EditTime { get; }
-        /// <summary>
-        /// The updated thread properties
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> Properties { get; }
-        /// <summary> The thread metadata. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedPerUserEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedPerUserEventData.Serialization.cs
deleted file mode 100644
index 572d294f52df..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedPerUserEventData.Serialization.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadPropertiesUpdatedPerUserEventData : IUtf8JsonSerializable, IJsonModel<AcsChatThreadPropertiesUpdatedPerUserEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadPropertiesUpdatedPerUserEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadPropertiesUpdatedPerUserEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadPropertiesUpdatedPerUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadPropertiesUpdatedPerUserEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("editedByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(EditedByCommunicationIdentifier, options);
-            writer.WritePropertyName("editTime"u8);
-            writer.WriteStringValue(EditTime, "O");
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteStartObject();
-            foreach (var item in Metadata)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            foreach (var item in Properties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-        }
-
-        AcsChatThreadPropertiesUpdatedPerUserEventData IJsonModel<AcsChatThreadPropertiesUpdatedPerUserEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadPropertiesUpdatedPerUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadPropertiesUpdatedPerUserEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadPropertiesUpdatedPerUserEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadPropertiesUpdatedPerUserEventData DeserializeAcsChatThreadPropertiesUpdatedPerUserEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel editedByCommunicationIdentifier = default;
-            DateTimeOffset editTime = default;
-            IReadOnlyDictionary<string, string> metadata = default;
-            IReadOnlyDictionary<string, BinaryData> properties = default;
-            DateTimeOffset createTime = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("editedByCommunicationIdentifier"u8))
-                {
-                    editedByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("editTime"u8))
-                {
-                    editTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("metadata"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    metadata = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    properties = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadPropertiesUpdatedPerUserEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version,
-                editedByCommunicationIdentifier,
-                editTime,
-                metadata,
-                properties);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadPropertiesUpdatedPerUserEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadPropertiesUpdatedPerUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadPropertiesUpdatedPerUserEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadPropertiesUpdatedPerUserEventData IPersistableModel<AcsChatThreadPropertiesUpdatedPerUserEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadPropertiesUpdatedPerUserEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadPropertiesUpdatedPerUserEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadPropertiesUpdatedPerUserEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadPropertiesUpdatedPerUserEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatThreadPropertiesUpdatedPerUserEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadPropertiesUpdatedPerUserEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedPerUserEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedPerUserEventData.cs
deleted file mode 100644
index 571ff029f325..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadPropertiesUpdatedPerUserEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatThreadPropertiesUpdatedPerUser event. </summary>
-    public partial class AcsChatThreadPropertiesUpdatedPerUserEventData : AcsChatThreadEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadPropertiesUpdatedPerUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="editedByCommunicationIdentifier"> The communication identifier of the user who updated the thread properties. </param>
-        /// <param name="editTime"> The time at which the properties of the thread were updated. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="properties"> The updated thread properties. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/>, <paramref name="editedByCommunicationIdentifier"/>, <paramref name="metadata"/> or <paramref name="properties"/> is null. </exception>
-        internal AcsChatThreadPropertiesUpdatedPerUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, DateTimeOffset createTime, CommunicationIdentifierModel editedByCommunicationIdentifier, DateTimeOffset editTime, IReadOnlyDictionary<string, string> metadata, IReadOnlyDictionary<string, BinaryData> properties) : base(recipientCommunicationIdentifier, createTime)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(editedByCommunicationIdentifier, nameof(editedByCommunicationIdentifier));
-            Argument.AssertNotNull(metadata, nameof(metadata));
-            Argument.AssertNotNull(properties, nameof(properties));
-
-            EditedByCommunicationIdentifier = editedByCommunicationIdentifier;
-            EditTime = editTime;
-            Metadata = metadata;
-            Properties = properties;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadPropertiesUpdatedPerUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="editedByCommunicationIdentifier"> The communication identifier of the user who updated the thread properties. </param>
-        /// <param name="editTime"> The time at which the properties of the thread were updated. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="properties"> The updated thread properties. </param>
-        internal AcsChatThreadPropertiesUpdatedPerUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version, CommunicationIdentifierModel editedByCommunicationIdentifier, DateTimeOffset editTime, IReadOnlyDictionary<string, string> metadata, IReadOnlyDictionary<string, BinaryData> properties) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData, createTime, version)
-        {
-            EditedByCommunicationIdentifier = editedByCommunicationIdentifier;
-            EditTime = editTime;
-            Metadata = metadata;
-            Properties = properties;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadPropertiesUpdatedPerUserEventData"/> for deserialization. </summary>
-        internal AcsChatThreadPropertiesUpdatedPerUserEventData()
-        {
-        }
-
-        /// <summary> The communication identifier of the user who updated the thread properties. </summary>
-        public CommunicationIdentifierModel EditedByCommunicationIdentifier { get; }
-        /// <summary> The time at which the properties of the thread were updated. </summary>
-        public DateTimeOffset EditTime { get; }
-        /// <summary> The thread metadata. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
-        /// <summary>
-        /// The updated thread properties
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> Properties { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadWithUserDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadWithUserDeletedEventData.Serialization.cs
deleted file mode 100644
index e3eb7fc57494..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadWithUserDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsChatThreadWithUserDeletedEventData : IUtf8JsonSerializable, IJsonModel<AcsChatThreadWithUserDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsChatThreadWithUserDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsChatThreadWithUserDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadWithUserDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadWithUserDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("deletedByCommunicationIdentifier"u8);
-            writer.WriteObjectValue(DeletedByCommunicationIdentifier, options);
-            writer.WritePropertyName("deleteTime"u8);
-            writer.WriteStringValue(DeleteTime, "O");
-        }
-
-        AcsChatThreadWithUserDeletedEventData IJsonModel<AcsChatThreadWithUserDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadWithUserDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsChatThreadWithUserDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsChatThreadWithUserDeletedEventData(document.RootElement, options);
-        }
-
-        internal static AcsChatThreadWithUserDeletedEventData DeserializeAcsChatThreadWithUserDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel deletedByCommunicationIdentifier = default;
-            DateTimeOffset deleteTime = default;
-            DateTimeOffset createTime = default;
-            long? version = default;
-            CommunicationIdentifierModel recipientCommunicationIdentifier = default;
-            string transactionId = default;
-            string threadId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deletedByCommunicationIdentifier"u8))
-                {
-                    deletedByCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("deleteTime"u8))
-                {
-                    deleteTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("createTime"u8))
-                {
-                    createTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recipientCommunicationIdentifier"u8))
-                {
-                    recipientCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("transactionId"u8))
-                {
-                    transactionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("threadId"u8))
-                {
-                    threadId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsChatThreadWithUserDeletedEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData,
-                createTime,
-                version,
-                deletedByCommunicationIdentifier,
-                deleteTime);
-        }
-
-        BinaryData IPersistableModel<AcsChatThreadWithUserDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadWithUserDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadWithUserDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsChatThreadWithUserDeletedEventData IPersistableModel<AcsChatThreadWithUserDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsChatThreadWithUserDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsChatThreadWithUserDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsChatThreadWithUserDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsChatThreadWithUserDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsChatThreadWithUserDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsChatThreadWithUserDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadWithUserDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadWithUserDeletedEventData.cs
deleted file mode 100644
index 2b366137bfd7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsChatThreadWithUserDeletedEventData.cs
+++ /dev/null
@@ -1,56 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.ChatThreadWithUserDeleted event. </summary>
-    public partial class AcsChatThreadWithUserDeletedEventData : AcsChatThreadEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadWithUserDeletedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="deletedByCommunicationIdentifier"> The communication identifier of the user who deleted the thread. </param>
-        /// <param name="deleteTime"> The deletion time of the thread. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recipientCommunicationIdentifier"/> or <paramref name="deletedByCommunicationIdentifier"/> is null. </exception>
-        internal AcsChatThreadWithUserDeletedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, DateTimeOffset createTime, CommunicationIdentifierModel deletedByCommunicationIdentifier, DateTimeOffset deleteTime) : base(recipientCommunicationIdentifier, createTime)
-        {
-            Argument.AssertNotNull(recipientCommunicationIdentifier, nameof(recipientCommunicationIdentifier));
-            Argument.AssertNotNull(deletedByCommunicationIdentifier, nameof(deletedByCommunicationIdentifier));
-
-            DeletedByCommunicationIdentifier = deletedByCommunicationIdentifier;
-            DeleteTime = deleteTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadWithUserDeletedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="deletedByCommunicationIdentifier"> The communication identifier of the user who deleted the thread. </param>
-        /// <param name="deleteTime"> The deletion time of the thread. </param>
-        internal AcsChatThreadWithUserDeletedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier, string transactionId, string threadId, IDictionary<string, BinaryData> serializedAdditionalRawData, DateTimeOffset createTime, long? version, CommunicationIdentifierModel deletedByCommunicationIdentifier, DateTimeOffset deleteTime) : base(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData, createTime, version)
-        {
-            DeletedByCommunicationIdentifier = deletedByCommunicationIdentifier;
-            DeleteTime = deleteTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsChatThreadWithUserDeletedEventData"/> for deserialization. </summary>
-        internal AcsChatThreadWithUserDeletedEventData()
-        {
-        }
-
-        /// <summary> The communication identifier of the user who deleted the thread. </summary>
-        public CommunicationIdentifierModel DeletedByCommunicationIdentifier { get; }
-        /// <summary> The deletion time of the thread. </summary>
-        public DateTimeOffset DeleteTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportReceivedEventData.Serialization.cs
deleted file mode 100644
index e923e3d0b390..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportReceivedEventData.Serialization.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsEmailDeliveryReportReceivedEventData : IUtf8JsonSerializable, IJsonModel<AcsEmailDeliveryReportReceivedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsEmailDeliveryReportReceivedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsEmailDeliveryReportReceivedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailDeliveryReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsEmailDeliveryReportReceivedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Sender))
-            {
-                writer.WritePropertyName("sender"u8);
-                writer.WriteStringValue(Sender);
-            }
-            if (Optional.IsDefined(Recipient))
-            {
-                writer.WritePropertyName("recipient"u8);
-                writer.WriteStringValue(Recipient);
-            }
-            if (Optional.IsDefined(MessageId))
-            {
-                writer.WritePropertyName("messageId"u8);
-                writer.WriteStringValue(MessageId);
-            }
-            writer.WritePropertyName("status"u8);
-            writer.WriteStringValue(Status.ToString());
-            writer.WritePropertyName("deliveryStatusDetails"u8);
-            writer.WriteObjectValue(DeliveryStatusDetails, options);
-            writer.WritePropertyName("deliveryAttemptTimeStamp"u8);
-            writer.WriteStringValue(DeliveryAttemptTimestamp, "O");
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsEmailDeliveryReportReceivedEventData IJsonModel<AcsEmailDeliveryReportReceivedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailDeliveryReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsEmailDeliveryReportReceivedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsEmailDeliveryReportReceivedEventData(document.RootElement, options);
-        }
-
-        internal static AcsEmailDeliveryReportReceivedEventData DeserializeAcsEmailDeliveryReportReceivedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string sender = default;
-            string recipient = default;
-            string messageId = default;
-            AcsEmailDeliveryReportStatus status = default;
-            AcsEmailDeliveryReportStatusDetails deliveryStatusDetails = default;
-            DateTimeOffset deliveryAttemptTimeStamp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("sender"u8))
-                {
-                    sender = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("recipient"u8))
-                {
-                    recipient = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = new AcsEmailDeliveryReportStatus(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("deliveryStatusDetails"u8))
-                {
-                    deliveryStatusDetails = AcsEmailDeliveryReportStatusDetails.DeserializeAcsEmailDeliveryReportStatusDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("deliveryAttemptTimeStamp"u8))
-                {
-                    deliveryAttemptTimeStamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsEmailDeliveryReportReceivedEventData(
-                sender,
-                recipient,
-                messageId,
-                status,
-                deliveryStatusDetails,
-                deliveryAttemptTimeStamp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsEmailDeliveryReportReceivedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailDeliveryReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsEmailDeliveryReportReceivedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsEmailDeliveryReportReceivedEventData IPersistableModel<AcsEmailDeliveryReportReceivedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailDeliveryReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsEmailDeliveryReportReceivedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsEmailDeliveryReportReceivedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsEmailDeliveryReportReceivedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsEmailDeliveryReportReceivedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsEmailDeliveryReportReceivedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportReceivedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportReceivedEventData.cs
deleted file mode 100644
index f733218d6093..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportReceivedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.EmailDeliveryReportReceived event. </summary>
-    public partial class AcsEmailDeliveryReportReceivedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailDeliveryReportReceivedEventData"/>. </summary>
-        /// <param name="status"> The status of the email. Any value other than Delivered is considered failed. </param>
-        /// <param name="deliveryStatusDetails"> Detailed information about the status if any. </param>
-        /// <param name="deliveryAttemptTimestamp"> The time at which the email delivery report received timestamp. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="deliveryStatusDetails"/> is null. </exception>
-        internal AcsEmailDeliveryReportReceivedEventData(AcsEmailDeliveryReportStatus status, AcsEmailDeliveryReportStatusDetails deliveryStatusDetails, DateTimeOffset deliveryAttemptTimestamp)
-        {
-            Argument.AssertNotNull(deliveryStatusDetails, nameof(deliveryStatusDetails));
-
-            Status = status;
-            DeliveryStatusDetails = deliveryStatusDetails;
-            DeliveryAttemptTimestamp = deliveryAttemptTimestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailDeliveryReportReceivedEventData"/>. </summary>
-        /// <param name="sender"> The Sender Email Address. </param>
-        /// <param name="recipient"> The recipient Email Address. </param>
-        /// <param name="messageId"> The Id of the email been sent. </param>
-        /// <param name="status"> The status of the email. Any value other than Delivered is considered failed. </param>
-        /// <param name="deliveryStatusDetails"> Detailed information about the status if any. </param>
-        /// <param name="deliveryAttemptTimestamp"> The time at which the email delivery report received timestamp. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsEmailDeliveryReportReceivedEventData(string sender, string recipient, string messageId, AcsEmailDeliveryReportStatus status, AcsEmailDeliveryReportStatusDetails deliveryStatusDetails, DateTimeOffset deliveryAttemptTimestamp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Sender = sender;
-            Recipient = recipient;
-            MessageId = messageId;
-            Status = status;
-            DeliveryStatusDetails = deliveryStatusDetails;
-            DeliveryAttemptTimestamp = deliveryAttemptTimestamp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailDeliveryReportReceivedEventData"/> for deserialization. </summary>
-        internal AcsEmailDeliveryReportReceivedEventData()
-        {
-        }
-
-        /// <summary> The Sender Email Address. </summary>
-        public string Sender { get; }
-        /// <summary> The recipient Email Address. </summary>
-        public string Recipient { get; }
-        /// <summary> The Id of the email been sent. </summary>
-        public string MessageId { get; }
-        /// <summary> The status of the email. Any value other than Delivered is considered failed. </summary>
-        public AcsEmailDeliveryReportStatus Status { get; }
-        /// <summary> Detailed information about the status if any. </summary>
-        public AcsEmailDeliveryReportStatusDetails DeliveryStatusDetails { get; }
-        /// <summary> The time at which the email delivery report received timestamp. </summary>
-        public DateTimeOffset DeliveryAttemptTimestamp { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatus.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatus.cs
deleted file mode 100644
index 116220d30935..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatus.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The status of the email. Any value other than Delivered is considered failed. </summary>
-    public readonly partial struct AcsEmailDeliveryReportStatus : IEquatable<AcsEmailDeliveryReportStatus>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailDeliveryReportStatus"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsEmailDeliveryReportStatus(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string BouncedValue = "Bounced";
-        private const string DeliveredValue = "Delivered";
-        private const string FailedValue = "Failed";
-        private const string FilteredSpamValue = "FilteredSpam";
-        private const string QuarantinedValue = "Quarantined";
-        private const string SuppressedValue = "Suppressed";
-
-        /// <summary> Hard bounce detected while sending the email. </summary>
-        public static AcsEmailDeliveryReportStatus Bounced { get; } = new AcsEmailDeliveryReportStatus(BouncedValue);
-        /// <summary> The email was delivered. </summary>
-        public static AcsEmailDeliveryReportStatus Delivered { get; } = new AcsEmailDeliveryReportStatus(DeliveredValue);
-        /// <summary> The email failed to be delivered. </summary>
-        public static AcsEmailDeliveryReportStatus Failed { get; } = new AcsEmailDeliveryReportStatus(FailedValue);
-        /// <summary> The message was identified as spam and was rejected or blocked (not quarantined). </summary>
-        public static AcsEmailDeliveryReportStatus FilteredSpam { get; } = new AcsEmailDeliveryReportStatus(FilteredSpamValue);
-        /// <summary> The message was quarantined (as spam, bulk mail, or phishing). For more information, see Quarantined email messages in EOP (EXCHANGE ONLINE PROTECTION). </summary>
-        public static AcsEmailDeliveryReportStatus Quarantined { get; } = new AcsEmailDeliveryReportStatus(QuarantinedValue);
-        /// <summary> The email was suppressed. </summary>
-        public static AcsEmailDeliveryReportStatus Suppressed { get; } = new AcsEmailDeliveryReportStatus(SuppressedValue);
-        /// <summary> Determines if two <see cref="AcsEmailDeliveryReportStatus"/> values are the same. </summary>
-        public static bool operator ==(AcsEmailDeliveryReportStatus left, AcsEmailDeliveryReportStatus right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsEmailDeliveryReportStatus"/> values are not the same. </summary>
-        public static bool operator !=(AcsEmailDeliveryReportStatus left, AcsEmailDeliveryReportStatus right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsEmailDeliveryReportStatus"/>. </summary>
-        public static implicit operator AcsEmailDeliveryReportStatus(string value) => new AcsEmailDeliveryReportStatus(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsEmailDeliveryReportStatus other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsEmailDeliveryReportStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatusDetails.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatusDetails.Serialization.cs
deleted file mode 100644
index e1627716463b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatusDetails.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsEmailDeliveryReportStatusDetails : IUtf8JsonSerializable, IJsonModel<AcsEmailDeliveryReportStatusDetails>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsEmailDeliveryReportStatusDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsEmailDeliveryReportStatusDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailDeliveryReportStatusDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsEmailDeliveryReportStatusDetails)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(StatusMessage))
-            {
-                writer.WritePropertyName("statusMessage"u8);
-                writer.WriteStringValue(StatusMessage);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsEmailDeliveryReportStatusDetails IJsonModel<AcsEmailDeliveryReportStatusDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailDeliveryReportStatusDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsEmailDeliveryReportStatusDetails)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsEmailDeliveryReportStatusDetails(document.RootElement, options);
-        }
-
-        internal static AcsEmailDeliveryReportStatusDetails DeserializeAcsEmailDeliveryReportStatusDetails(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string statusMessage = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("statusMessage"u8))
-                {
-                    statusMessage = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsEmailDeliveryReportStatusDetails(statusMessage, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsEmailDeliveryReportStatusDetails>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailDeliveryReportStatusDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsEmailDeliveryReportStatusDetails)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsEmailDeliveryReportStatusDetails IPersistableModel<AcsEmailDeliveryReportStatusDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailDeliveryReportStatusDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsEmailDeliveryReportStatusDetails(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsEmailDeliveryReportStatusDetails)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsEmailDeliveryReportStatusDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsEmailDeliveryReportStatusDetails FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsEmailDeliveryReportStatusDetails(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatusDetails.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatusDetails.cs
deleted file mode 100644
index 23a571fbcab0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailDeliveryReportStatusDetails.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Detailed information about the status if any. </summary>
-    public partial class AcsEmailDeliveryReportStatusDetails
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailDeliveryReportStatusDetails"/>. </summary>
-        internal AcsEmailDeliveryReportStatusDetails()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailDeliveryReportStatusDetails"/>. </summary>
-        /// <param name="statusMessage"> Detailed status message. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsEmailDeliveryReportStatusDetails(string statusMessage, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            StatusMessage = statusMessage;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Detailed status message. </summary>
-        public string StatusMessage { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailEngagementTrackingReportReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailEngagementTrackingReportReceivedEventData.Serialization.cs
deleted file mode 100644
index de59f4582b5e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailEngagementTrackingReportReceivedEventData.Serialization.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsEmailEngagementTrackingReportReceivedEventData : IUtf8JsonSerializable, IJsonModel<AcsEmailEngagementTrackingReportReceivedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsEmailEngagementTrackingReportReceivedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsEmailEngagementTrackingReportReceivedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailEngagementTrackingReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsEmailEngagementTrackingReportReceivedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Sender))
-            {
-                writer.WritePropertyName("sender"u8);
-                writer.WriteStringValue(Sender);
-            }
-            if (Optional.IsDefined(Recipient))
-            {
-                writer.WritePropertyName("recipient"u8);
-                writer.WriteStringValue(Recipient);
-            }
-            if (Optional.IsDefined(MessageId))
-            {
-                writer.WritePropertyName("messageId"u8);
-                writer.WriteStringValue(MessageId);
-            }
-            writer.WritePropertyName("userActionTimeStamp"u8);
-            writer.WriteStringValue(UserActionTimestamp, "O");
-            if (Optional.IsDefined(EngagementContext))
-            {
-                writer.WritePropertyName("engagementContext"u8);
-                writer.WriteStringValue(EngagementContext);
-            }
-            if (Optional.IsDefined(UserAgent))
-            {
-                writer.WritePropertyName("userAgent"u8);
-                writer.WriteStringValue(UserAgent);
-            }
-            writer.WritePropertyName("engagementType"u8);
-            writer.WriteStringValue(Engagement.ToString());
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsEmailEngagementTrackingReportReceivedEventData IJsonModel<AcsEmailEngagementTrackingReportReceivedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailEngagementTrackingReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsEmailEngagementTrackingReportReceivedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsEmailEngagementTrackingReportReceivedEventData(document.RootElement, options);
-        }
-
-        internal static AcsEmailEngagementTrackingReportReceivedEventData DeserializeAcsEmailEngagementTrackingReportReceivedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string sender = default;
-            string recipient = default;
-            string messageId = default;
-            DateTimeOffset userActionTimeStamp = default;
-            string engagementContext = default;
-            string userAgent = default;
-            AcsUserEngagement engagementType = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("sender"u8))
-                {
-                    sender = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("recipient"u8))
-                {
-                    recipient = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("userActionTimeStamp"u8))
-                {
-                    userActionTimeStamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("engagementContext"u8))
-                {
-                    engagementContext = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("userAgent"u8))
-                {
-                    userAgent = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("engagementType"u8))
-                {
-                    engagementType = new AcsUserEngagement(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsEmailEngagementTrackingReportReceivedEventData(
-                sender,
-                recipient,
-                messageId,
-                userActionTimeStamp,
-                engagementContext,
-                userAgent,
-                engagementType,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsEmailEngagementTrackingReportReceivedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailEngagementTrackingReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsEmailEngagementTrackingReportReceivedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsEmailEngagementTrackingReportReceivedEventData IPersistableModel<AcsEmailEngagementTrackingReportReceivedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsEmailEngagementTrackingReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsEmailEngagementTrackingReportReceivedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsEmailEngagementTrackingReportReceivedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsEmailEngagementTrackingReportReceivedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsEmailEngagementTrackingReportReceivedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsEmailEngagementTrackingReportReceivedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailEngagementTrackingReportReceivedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailEngagementTrackingReportReceivedEventData.cs
deleted file mode 100644
index 9de2267639d7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsEmailEngagementTrackingReportReceivedEventData.cs
+++ /dev/null
@@ -1,98 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.EmailEngagementTrackingReportReceived event. </summary>
-    public partial class AcsEmailEngagementTrackingReportReceivedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailEngagementTrackingReportReceivedEventData"/>. </summary>
-        /// <param name="userActionTimestamp"> The time at which the user interacted with the email. </param>
-        /// <param name="engagement"> The type of engagement user have with email. </param>
-        internal AcsEmailEngagementTrackingReportReceivedEventData(DateTimeOffset userActionTimestamp, AcsUserEngagement engagement)
-        {
-            UserActionTimestamp = userActionTimestamp;
-            Engagement = engagement;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailEngagementTrackingReportReceivedEventData"/>. </summary>
-        /// <param name="sender"> The Sender Email Address. </param>
-        /// <param name="recipient"> The Recipient Email Address. </param>
-        /// <param name="messageId"> The Id of the email that has been sent. </param>
-        /// <param name="userActionTimestamp"> The time at which the user interacted with the email. </param>
-        /// <param name="engagementContext"> The context of the type of engagement user had with email. </param>
-        /// <param name="userAgent"> The user agent interacting with the email. </param>
-        /// <param name="engagement"> The type of engagement user have with email. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsEmailEngagementTrackingReportReceivedEventData(string sender, string recipient, string messageId, DateTimeOffset userActionTimestamp, string engagementContext, string userAgent, AcsUserEngagement engagement, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Sender = sender;
-            Recipient = recipient;
-            MessageId = messageId;
-            UserActionTimestamp = userActionTimestamp;
-            EngagementContext = engagementContext;
-            UserAgent = userAgent;
-            Engagement = engagement;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsEmailEngagementTrackingReportReceivedEventData"/> for deserialization. </summary>
-        internal AcsEmailEngagementTrackingReportReceivedEventData()
-        {
-        }
-
-        /// <summary> The Sender Email Address. </summary>
-        public string Sender { get; }
-        /// <summary> The Recipient Email Address. </summary>
-        public string Recipient { get; }
-        /// <summary> The Id of the email that has been sent. </summary>
-        public string MessageId { get; }
-        /// <summary> The time at which the user interacted with the email. </summary>
-        public DateTimeOffset UserActionTimestamp { get; }
-        /// <summary> The context of the type of engagement user had with email. </summary>
-        public string EngagementContext { get; }
-        /// <summary> The user agent interacting with the email. </summary>
-        public string UserAgent { get; }
-        /// <summary> The type of engagement user have with email. </summary>
-        public AcsUserEngagement Engagement { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallCustomContext.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallCustomContext.Serialization.cs
deleted file mode 100644
index 469e084d67b5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallCustomContext.Serialization.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsIncomingCallCustomContext : IUtf8JsonSerializable, IJsonModel<AcsIncomingCallCustomContext>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsIncomingCallCustomContext>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsIncomingCallCustomContext>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsIncomingCallCustomContext>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsIncomingCallCustomContext)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("sipHeaders"u8);
-            writer.WriteStartObject();
-            foreach (var item in SipHeaders)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("voipHeaders"u8);
-            writer.WriteStartObject();
-            foreach (var item in VoipHeaders)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsIncomingCallCustomContext IJsonModel<AcsIncomingCallCustomContext>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsIncomingCallCustomContext>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsIncomingCallCustomContext)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsIncomingCallCustomContext(document.RootElement, options);
-        }
-
-        internal static AcsIncomingCallCustomContext DeserializeAcsIncomingCallCustomContext(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyDictionary<string, string> sipHeaders = default;
-            IReadOnlyDictionary<string, string> voipHeaders = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("sipHeaders"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    sipHeaders = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("voipHeaders"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    voipHeaders = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsIncomingCallCustomContext(sipHeaders, voipHeaders, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsIncomingCallCustomContext>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsIncomingCallCustomContext>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsIncomingCallCustomContext)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsIncomingCallCustomContext IPersistableModel<AcsIncomingCallCustomContext>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsIncomingCallCustomContext>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsIncomingCallCustomContext(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsIncomingCallCustomContext)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsIncomingCallCustomContext>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsIncomingCallCustomContext FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsIncomingCallCustomContext(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallCustomContext.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallCustomContext.cs
deleted file mode 100644
index 56afdcd867fb..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallCustomContext.cs
+++ /dev/null
@@ -1,82 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Custom Context of Incoming Call. </summary>
-    public partial class AcsIncomingCallCustomContext
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsIncomingCallCustomContext"/>. </summary>
-        /// <param name="sipHeaders"> Sip Headers for incoming call. </param>
-        /// <param name="voipHeaders"> Voip Headers for incoming call. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="sipHeaders"/> or <paramref name="voipHeaders"/> is null. </exception>
-        internal AcsIncomingCallCustomContext(IReadOnlyDictionary<string, string> sipHeaders, IReadOnlyDictionary<string, string> voipHeaders)
-        {
-            Argument.AssertNotNull(sipHeaders, nameof(sipHeaders));
-            Argument.AssertNotNull(voipHeaders, nameof(voipHeaders));
-
-            SipHeaders = sipHeaders;
-            VoipHeaders = voipHeaders;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsIncomingCallCustomContext"/>. </summary>
-        /// <param name="sipHeaders"> Sip Headers for incoming call. </param>
-        /// <param name="voipHeaders"> Voip Headers for incoming call. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsIncomingCallCustomContext(IReadOnlyDictionary<string, string> sipHeaders, IReadOnlyDictionary<string, string> voipHeaders, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            SipHeaders = sipHeaders;
-            VoipHeaders = voipHeaders;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsIncomingCallCustomContext"/> for deserialization. </summary>
-        internal AcsIncomingCallCustomContext()
-        {
-        }
-
-        /// <summary> Sip Headers for incoming call. </summary>
-        public IReadOnlyDictionary<string, string> SipHeaders { get; }
-        /// <summary> Voip Headers for incoming call. </summary>
-        public IReadOnlyDictionary<string, string> VoipHeaders { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallEventData.Serialization.cs
deleted file mode 100644
index 30e667ddb263..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallEventData.Serialization.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsIncomingCallEventData : IUtf8JsonSerializable, IJsonModel<AcsIncomingCallEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsIncomingCallEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsIncomingCallEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsIncomingCallEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsIncomingCallEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("to"u8);
-            writer.WriteObjectValue(ToCommunicationIdentifier, options);
-            writer.WritePropertyName("from"u8);
-            writer.WriteObjectValue(FromCommunicationIdentifier, options);
-            if (Optional.IsDefined(ServerCallId))
-            {
-                writer.WritePropertyName("serverCallId"u8);
-                writer.WriteStringValue(ServerCallId);
-            }
-            if (Optional.IsDefined(CallerDisplayName))
-            {
-                writer.WritePropertyName("callerDisplayName"u8);
-                writer.WriteStringValue(CallerDisplayName);
-            }
-            writer.WritePropertyName("customContext"u8);
-            writer.WriteObjectValue(CustomContext, options);
-            if (Optional.IsDefined(IncomingCallContext))
-            {
-                writer.WritePropertyName("incomingCallContext"u8);
-                writer.WriteStringValue(IncomingCallContext);
-            }
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsIncomingCallEventData IJsonModel<AcsIncomingCallEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsIncomingCallEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsIncomingCallEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsIncomingCallEventData(document.RootElement, options);
-        }
-
-        internal static AcsIncomingCallEventData DeserializeAcsIncomingCallEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel to = default;
-            CommunicationIdentifierModel @from = default;
-            string serverCallId = default;
-            string callerDisplayName = default;
-            AcsIncomingCallCustomContext customContext = default;
-            string incomingCallContext = default;
-            string correlationId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("to"u8))
-                {
-                    to = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("from"u8))
-                {
-                    @from = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("serverCallId"u8))
-                {
-                    serverCallId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("callerDisplayName"u8))
-                {
-                    callerDisplayName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("customContext"u8))
-                {
-                    customContext = AcsIncomingCallCustomContext.DeserializeAcsIncomingCallCustomContext(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("incomingCallContext"u8))
-                {
-                    incomingCallContext = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsIncomingCallEventData(
-                to,
-                @from,
-                serverCallId,
-                callerDisplayName,
-                customContext,
-                incomingCallContext,
-                correlationId,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsIncomingCallEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsIncomingCallEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsIncomingCallEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsIncomingCallEventData IPersistableModel<AcsIncomingCallEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsIncomingCallEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsIncomingCallEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsIncomingCallEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsIncomingCallEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsIncomingCallEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsIncomingCallEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallEventData.cs
deleted file mode 100644
index a5ce2d8a623d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsIncomingCallEventData.cs
+++ /dev/null
@@ -1,105 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for an Microsoft.Communication.IncomingCall event. </summary>
-    public partial class AcsIncomingCallEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsIncomingCallEventData"/>. </summary>
-        /// <param name="toCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="fromCommunicationIdentifier"> The communication identifier of the user who initiated the call. </param>
-        /// <param name="customContext"> Custom Context of Incoming Call. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="toCommunicationIdentifier"/>, <paramref name="fromCommunicationIdentifier"/> or <paramref name="customContext"/> is null. </exception>
-        internal AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationIdentifier, CommunicationIdentifierModel fromCommunicationIdentifier, AcsIncomingCallCustomContext customContext)
-        {
-            Argument.AssertNotNull(toCommunicationIdentifier, nameof(toCommunicationIdentifier));
-            Argument.AssertNotNull(fromCommunicationIdentifier, nameof(fromCommunicationIdentifier));
-            Argument.AssertNotNull(customContext, nameof(customContext));
-
-            ToCommunicationIdentifier = toCommunicationIdentifier;
-            FromCommunicationIdentifier = fromCommunicationIdentifier;
-            CustomContext = customContext;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsIncomingCallEventData"/>. </summary>
-        /// <param name="toCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="fromCommunicationIdentifier"> The communication identifier of the user who initiated the call. </param>
-        /// <param name="serverCallId"> The Id of the server call. </param>
-        /// <param name="callerDisplayName"> Display name of caller. </param>
-        /// <param name="customContext"> Custom Context of Incoming Call. </param>
-        /// <param name="incomingCallContext"> Signed incoming call context. </param>
-        /// <param name="correlationId"> CorrelationId (CallId). </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationIdentifier, CommunicationIdentifierModel fromCommunicationIdentifier, string serverCallId, string callerDisplayName, AcsIncomingCallCustomContext customContext, string incomingCallContext, string correlationId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ToCommunicationIdentifier = toCommunicationIdentifier;
-            FromCommunicationIdentifier = fromCommunicationIdentifier;
-            ServerCallId = serverCallId;
-            CallerDisplayName = callerDisplayName;
-            CustomContext = customContext;
-            IncomingCallContext = incomingCallContext;
-            CorrelationId = correlationId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsIncomingCallEventData"/> for deserialization. </summary>
-        internal AcsIncomingCallEventData()
-        {
-        }
-
-        /// <summary> The communication identifier of the target user. </summary>
-        public CommunicationIdentifierModel ToCommunicationIdentifier { get; }
-        /// <summary> The communication identifier of the user who initiated the call. </summary>
-        public CommunicationIdentifierModel FromCommunicationIdentifier { get; }
-        /// <summary> The Id of the server call. </summary>
-        public string ServerCallId { get; }
-        /// <summary> Display name of caller. </summary>
-        public string CallerDisplayName { get; }
-        /// <summary> Custom Context of Incoming Call. </summary>
-        public AcsIncomingCallCustomContext CustomContext { get; }
-        /// <summary> Signed incoming call context. </summary>
-        public string IncomingCallContext { get; }
-        /// <summary> CorrelationId (CallId). </summary>
-        public string CorrelationId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsInteractiveReplyKind.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsInteractiveReplyKind.cs
deleted file mode 100644
index 0ab05d173ed6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsInteractiveReplyKind.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Interactive reply kind. </summary>
-    public readonly partial struct AcsInteractiveReplyKind : IEquatable<AcsInteractiveReplyKind>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsInteractiveReplyKind"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsInteractiveReplyKind(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ButtonReplyValue = "buttonReply";
-        private const string ListReplyValue = "listReply";
-        private const string UnknownValue = "unknown";
-
-        /// <summary> Messaged interactive reply type is ButtonReply. </summary>
-        public static AcsInteractiveReplyKind ButtonReply { get; } = new AcsInteractiveReplyKind(ButtonReplyValue);
-        /// <summary> Messaged interactive reply type is ListReply. </summary>
-        public static AcsInteractiveReplyKind ListReply { get; } = new AcsInteractiveReplyKind(ListReplyValue);
-        /// <summary> Messaged interactive reply type is Unknown. </summary>
-        public static AcsInteractiveReplyKind Unknown { get; } = new AcsInteractiveReplyKind(UnknownValue);
-        /// <summary> Determines if two <see cref="AcsInteractiveReplyKind"/> values are the same. </summary>
-        public static bool operator ==(AcsInteractiveReplyKind left, AcsInteractiveReplyKind right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsInteractiveReplyKind"/> values are not the same. </summary>
-        public static bool operator !=(AcsInteractiveReplyKind left, AcsInteractiveReplyKind right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsInteractiveReplyKind"/>. </summary>
-        public static implicit operator AcsInteractiveReplyKind(string value) => new AcsInteractiveReplyKind(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsInteractiveReplyKind other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsInteractiveReplyKind other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageButtonContent.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageButtonContent.Serialization.cs
deleted file mode 100644
index e275f42cae70..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageButtonContent.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageButtonContent : IUtf8JsonSerializable, IJsonModel<AcsMessageButtonContent>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageButtonContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageButtonContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageButtonContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageButtonContent)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Text))
-            {
-                writer.WritePropertyName("text"u8);
-                writer.WriteStringValue(Text);
-            }
-            if (Optional.IsDefined(Payload))
-            {
-                writer.WritePropertyName("payload"u8);
-                writer.WriteStringValue(Payload);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsMessageButtonContent IJsonModel<AcsMessageButtonContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageButtonContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageButtonContent)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageButtonContent(document.RootElement, options);
-        }
-
-        internal static AcsMessageButtonContent DeserializeAcsMessageButtonContent(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string text = default;
-            string payload = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("text"u8))
-                {
-                    text = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("payload"u8))
-                {
-                    payload = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageButtonContent(text, payload, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsMessageButtonContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageButtonContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageButtonContent)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageButtonContent IPersistableModel<AcsMessageButtonContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageButtonContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageButtonContent(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageButtonContent)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageButtonContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsMessageButtonContent FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageButtonContent(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageButtonContent.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageButtonContent.cs
deleted file mode 100644
index 45a1fd73025a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageButtonContent.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message Button Content. </summary>
-    public partial class AcsMessageButtonContent
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageButtonContent"/>. </summary>
-        internal AcsMessageButtonContent()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageButtonContent"/>. </summary>
-        /// <param name="text"> The Text of the button. </param>
-        /// <param name="payload"> The Payload of the button which was clicked by the user, setup by the business. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsMessageButtonContent(string text, string payload, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Text = text;
-            Payload = payload;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The Text of the button. </summary>
-        public string Text { get; }
-        /// <summary> The Payload of the button which was clicked by the user, setup by the business. </summary>
-        public string Payload { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelEventError.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelEventError.Serialization.cs
deleted file mode 100644
index bcfd6c23a26a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelEventError.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageChannelEventError : IUtf8JsonSerializable, IJsonModel<AcsMessageChannelEventError>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageChannelEventError>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageChannelEventError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageChannelEventError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageChannelEventError)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ChannelCode))
-            {
-                writer.WritePropertyName("channelCode"u8);
-                writer.WriteStringValue(ChannelCode);
-            }
-            if (Optional.IsDefined(ChannelMessage))
-            {
-                writer.WritePropertyName("channelMessage"u8);
-                writer.WriteStringValue(ChannelMessage);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsMessageChannelEventError IJsonModel<AcsMessageChannelEventError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageChannelEventError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageChannelEventError)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageChannelEventError(document.RootElement, options);
-        }
-
-        internal static AcsMessageChannelEventError DeserializeAcsMessageChannelEventError(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string channelCode = default;
-            string channelMessage = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("channelCode"u8))
-                {
-                    channelCode = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelMessage"u8))
-                {
-                    channelMessage = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageChannelEventError(channelCode, channelMessage, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsMessageChannelEventError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageChannelEventError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageChannelEventError)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageChannelEventError IPersistableModel<AcsMessageChannelEventError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageChannelEventError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageChannelEventError(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageChannelEventError)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageChannelEventError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsMessageChannelEventError FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageChannelEventError(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelEventError.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelEventError.cs
deleted file mode 100644
index d8cc61fcb0a2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelEventError.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message Channel Event Error. </summary>
-    public partial class AcsMessageChannelEventError
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageChannelEventError"/>. </summary>
-        internal AcsMessageChannelEventError()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageChannelEventError"/>. </summary>
-        /// <param name="channelCode"> The channel error code. </param>
-        /// <param name="channelMessage"> The channel error message. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsMessageChannelEventError(string channelCode, string channelMessage, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ChannelCode = channelCode;
-            ChannelMessage = channelMessage;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The channel error code. </summary>
-        public string ChannelCode { get; }
-        /// <summary> The channel error message. </summary>
-        public string ChannelMessage { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelKind.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelKind.cs
deleted file mode 100644
index 6fb22ab63ec1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageChannelKind.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message channel kind. </summary>
-    public readonly partial struct AcsMessageChannelKind : IEquatable<AcsMessageChannelKind>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageChannelKind"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsMessageChannelKind(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string WhatsappValue = "whatsapp";
-
-        /// <summary> Updated message channel type is WhatsApp. </summary>
-        public static AcsMessageChannelKind Whatsapp { get; } = new AcsMessageChannelKind(WhatsappValue);
-        /// <summary> Determines if two <see cref="AcsMessageChannelKind"/> values are the same. </summary>
-        public static bool operator ==(AcsMessageChannelKind left, AcsMessageChannelKind right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsMessageChannelKind"/> values are not the same. </summary>
-        public static bool operator !=(AcsMessageChannelKind left, AcsMessageChannelKind right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsMessageChannelKind"/>. </summary>
-        public static implicit operator AcsMessageChannelKind(string value) => new AcsMessageChannelKind(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsMessageChannelKind other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsMessageChannelKind other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageContext.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageContext.Serialization.cs
deleted file mode 100644
index 9ffc096f009a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageContext.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageContext : IUtf8JsonSerializable, IJsonModel<AcsMessageContext>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageContext>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageContext>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageContext>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageContext)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(From))
-            {
-                writer.WritePropertyName("from"u8);
-                writer.WriteStringValue(From);
-            }
-            if (Optional.IsDefined(MessageId))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(MessageId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsMessageContext IJsonModel<AcsMessageContext>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageContext>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageContext)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageContext(document.RootElement, options);
-        }
-
-        internal static AcsMessageContext DeserializeAcsMessageContext(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string @from = default;
-            string id = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("from"u8))
-                {
-                    @from = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageContext(@from, id, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsMessageContext>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageContext>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageContext)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageContext IPersistableModel<AcsMessageContext>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageContext>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageContext(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageContext)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageContext>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsMessageContext FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageContext(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageContext.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageContext.cs
deleted file mode 100644
index d347701b6a6c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageContext.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message Context. </summary>
-    public partial class AcsMessageContext
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageContext"/>. </summary>
-        internal AcsMessageContext()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageContext"/>. </summary>
-        /// <param name="from"> The WhatsApp ID for the customer who replied to an inbound message. </param>
-        /// <param name="messageId"> The message ID for the sent message for an inbound reply. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsMessageContext(string @from, string messageId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            From = @from;
-            MessageId = messageId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The WhatsApp ID for the customer who replied to an inbound message. </summary>
-        public string From { get; }
-        /// <summary> The message ID for the sent message for an inbound reply. </summary>
-        public string MessageId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatus.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatus.cs
deleted file mode 100644
index afb1a13707cd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatus.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message delivery status. </summary>
-    public readonly partial struct AcsMessageDeliveryStatus : IEquatable<AcsMessageDeliveryStatus>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageDeliveryStatus"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsMessageDeliveryStatus(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ReadValue = "read";
-        private const string DeliveredValue = "delivered";
-        private const string FailedValue = "failed";
-        private const string SentValue = "sent";
-        private const string WarningValue = "warning";
-        private const string UnknownValue = "unknown";
-
-        /// <summary> Read. </summary>
-        public static AcsMessageDeliveryStatus Read { get; } = new AcsMessageDeliveryStatus(ReadValue);
-        /// <summary> Delivered. </summary>
-        public static AcsMessageDeliveryStatus Delivered { get; } = new AcsMessageDeliveryStatus(DeliveredValue);
-        /// <summary> Failed. </summary>
-        public static AcsMessageDeliveryStatus Failed { get; } = new AcsMessageDeliveryStatus(FailedValue);
-        /// <summary> Sent. </summary>
-        public static AcsMessageDeliveryStatus Sent { get; } = new AcsMessageDeliveryStatus(SentValue);
-        /// <summary> Warning. </summary>
-        public static AcsMessageDeliveryStatus Warning { get; } = new AcsMessageDeliveryStatus(WarningValue);
-        /// <summary> Unknown. </summary>
-        public static AcsMessageDeliveryStatus Unknown { get; } = new AcsMessageDeliveryStatus(UnknownValue);
-        /// <summary> Determines if two <see cref="AcsMessageDeliveryStatus"/> values are the same. </summary>
-        public static bool operator ==(AcsMessageDeliveryStatus left, AcsMessageDeliveryStatus right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsMessageDeliveryStatus"/> values are not the same. </summary>
-        public static bool operator !=(AcsMessageDeliveryStatus left, AcsMessageDeliveryStatus right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsMessageDeliveryStatus"/>. </summary>
-        public static implicit operator AcsMessageDeliveryStatus(string value) => new AcsMessageDeliveryStatus(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsMessageDeliveryStatus other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsMessageDeliveryStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatusUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatusUpdatedEventData.Serialization.cs
deleted file mode 100644
index 72b0f5b834ec..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatusUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageDeliveryStatusUpdatedEventData : IUtf8JsonSerializable, IJsonModel<AcsMessageDeliveryStatusUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageDeliveryStatusUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageDeliveryStatusUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageDeliveryStatusUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageDeliveryStatusUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(MessageId))
-            {
-                writer.WritePropertyName("messageId"u8);
-                writer.WriteStringValue(MessageId);
-            }
-            writer.WritePropertyName("status"u8);
-            writer.WriteStringValue(Status.ToString());
-            writer.WritePropertyName("channelType"u8);
-            writer.WriteStringValue(ChannelKind.ToString());
-        }
-
-        AcsMessageDeliveryStatusUpdatedEventData IJsonModel<AcsMessageDeliveryStatusUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageDeliveryStatusUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageDeliveryStatusUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageDeliveryStatusUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static AcsMessageDeliveryStatusUpdatedEventData DeserializeAcsMessageDeliveryStatusUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string messageId = default;
-            AcsMessageDeliveryStatus status = default;
-            AcsMessageChannelKind channelType = default;
-            string @from = default;
-            string to = default;
-            DateTimeOffset receivedTimeStamp = default;
-            AcsMessageChannelEventError error = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = new AcsMessageDeliveryStatus(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("channelType"u8))
-                {
-                    channelType = new AcsMessageChannelKind(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("from"u8))
-                {
-                    @from = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("to"u8))
-                {
-                    to = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("receivedTimeStamp"u8))
-                {
-                    receivedTimeStamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("error"u8))
-                {
-                    error = AcsMessageChannelEventError.DeserializeAcsMessageChannelEventError(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageDeliveryStatusUpdatedEventData(
-                @from,
-                to,
-                receivedTimeStamp,
-                error,
-                serializedAdditionalRawData,
-                messageId,
-                status,
-                channelType);
-        }
-
-        BinaryData IPersistableModel<AcsMessageDeliveryStatusUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageDeliveryStatusUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageDeliveryStatusUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageDeliveryStatusUpdatedEventData IPersistableModel<AcsMessageDeliveryStatusUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageDeliveryStatusUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageDeliveryStatusUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageDeliveryStatusUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageDeliveryStatusUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsMessageDeliveryStatusUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageDeliveryStatusUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatusUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatusUpdatedEventData.cs
deleted file mode 100644
index 08ee6836ec0e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageDeliveryStatusUpdatedEventData.cs
+++ /dev/null
@@ -1,58 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.AdvancedMessageDeliveryStatusUpdated event. </summary>
-    public partial class AcsMessageDeliveryStatusUpdatedEventData : AcsMessageEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsMessageDeliveryStatusUpdatedEventData"/>. </summary>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <param name="status"> The updated message status. </param>
-        /// <param name="channelKind"> The updated message channel type. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="error"/> is null. </exception>
-        internal AcsMessageDeliveryStatusUpdatedEventData(DateTimeOffset receivedTimestamp, AcsMessageChannelEventError error, AcsMessageDeliveryStatus status, AcsMessageChannelKind channelKind) : base(receivedTimestamp, error)
-        {
-            Argument.AssertNotNull(error, nameof(error));
-
-            Status = status;
-            ChannelKind = channelKind;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageDeliveryStatusUpdatedEventData"/>. </summary>
-        /// <param name="from"> The message sender. </param>
-        /// <param name="to"> The message recipient. </param>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="messageId"> The message id. </param>
-        /// <param name="status"> The updated message status. </param>
-        /// <param name="channelKind"> The updated message channel type. </param>
-        internal AcsMessageDeliveryStatusUpdatedEventData(string @from, string to, DateTimeOffset receivedTimestamp, AcsMessageChannelEventError error, IDictionary<string, BinaryData> serializedAdditionalRawData, string messageId, AcsMessageDeliveryStatus status, AcsMessageChannelKind channelKind) : base(@from, to, receivedTimestamp, error, serializedAdditionalRawData)
-        {
-            MessageId = messageId;
-            Status = status;
-            ChannelKind = channelKind;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageDeliveryStatusUpdatedEventData"/> for deserialization. </summary>
-        internal AcsMessageDeliveryStatusUpdatedEventData()
-        {
-        }
-
-        /// <summary> The message id. </summary>
-        public string MessageId { get; }
-        /// <summary> The updated message status. </summary>
-        public AcsMessageDeliveryStatus Status { get; }
-        /// <summary> The updated message channel type. </summary>
-        public AcsMessageChannelKind ChannelKind { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageEventData.Serialization.cs
deleted file mode 100644
index a2d1c63653e7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageEventData.Serialization.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageEventData : IUtf8JsonSerializable, IJsonModel<AcsMessageEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(From))
-            {
-                writer.WritePropertyName("from"u8);
-                writer.WriteStringValue(From);
-            }
-            if (Optional.IsDefined(To))
-            {
-                writer.WritePropertyName("to"u8);
-                writer.WriteStringValue(To);
-            }
-            writer.WritePropertyName("receivedTimeStamp"u8);
-            writer.WriteStringValue(ReceivedTimestamp, "O");
-            writer.WritePropertyName("error"u8);
-            writer.WriteObjectValue(Error, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsMessageEventData IJsonModel<AcsMessageEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageEventData(document.RootElement, options);
-        }
-
-        internal static AcsMessageEventData DeserializeAcsMessageEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string @from = default;
-            string to = default;
-            DateTimeOffset receivedTimeStamp = default;
-            AcsMessageChannelEventError error = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("from"u8))
-                {
-                    @from = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("to"u8))
-                {
-                    to = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("receivedTimeStamp"u8))
-                {
-                    receivedTimeStamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("error"u8))
-                {
-                    error = AcsMessageChannelEventError.DeserializeAcsMessageChannelEventError(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageEventData(@from, to, receivedTimeStamp, error, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsMessageEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageEventData IPersistableModel<AcsMessageEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsMessageEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageEventData.cs
deleted file mode 100644
index cedcc1dc0758..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all chat thread events. </summary>
-    public partial class AcsMessageEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageEventData"/>. </summary>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="error"/> is null. </exception>
-        internal AcsMessageEventData(DateTimeOffset receivedTimestamp, AcsMessageChannelEventError error)
-        {
-            Argument.AssertNotNull(error, nameof(error));
-
-            ReceivedTimestamp = receivedTimestamp;
-            Error = error;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageEventData"/>. </summary>
-        /// <param name="from"> The message sender. </param>
-        /// <param name="to"> The message recipient. </param>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsMessageEventData(string @from, string to, DateTimeOffset receivedTimestamp, AcsMessageChannelEventError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            From = @from;
-            To = to;
-            ReceivedTimestamp = receivedTimestamp;
-            Error = error;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageEventData"/> for deserialization. </summary>
-        internal AcsMessageEventData()
-        {
-        }
-
-        /// <summary> The message sender. </summary>
-        public string From { get; }
-        /// <summary> The message recipient. </summary>
-        public string To { get; }
-        /// <summary> The time message was received. </summary>
-        public DateTimeOffset ReceivedTimestamp { get; }
-        /// <summary> The channel event error. </summary>
-        public AcsMessageChannelEventError Error { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveButtonReplyContent.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveButtonReplyContent.Serialization.cs
deleted file mode 100644
index 2216403a633d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveButtonReplyContent.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageInteractiveButtonReplyContent : IUtf8JsonSerializable, IJsonModel<AcsMessageInteractiveButtonReplyContent>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageInteractiveButtonReplyContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageInteractiveButtonReplyContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveButtonReplyContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageInteractiveButtonReplyContent)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ButtonId))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(ButtonId);
-            }
-            if (Optional.IsDefined(Title))
-            {
-                writer.WritePropertyName("title"u8);
-                writer.WriteStringValue(Title);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsMessageInteractiveButtonReplyContent IJsonModel<AcsMessageInteractiveButtonReplyContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveButtonReplyContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageInteractiveButtonReplyContent)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageInteractiveButtonReplyContent(document.RootElement, options);
-        }
-
-        internal static AcsMessageInteractiveButtonReplyContent DeserializeAcsMessageInteractiveButtonReplyContent(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string title = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("title"u8))
-                {
-                    title = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageInteractiveButtonReplyContent(id, title, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsMessageInteractiveButtonReplyContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveButtonReplyContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageInteractiveButtonReplyContent)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageInteractiveButtonReplyContent IPersistableModel<AcsMessageInteractiveButtonReplyContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveButtonReplyContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageInteractiveButtonReplyContent(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageInteractiveButtonReplyContent)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageInteractiveButtonReplyContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsMessageInteractiveButtonReplyContent FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageInteractiveButtonReplyContent(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveButtonReplyContent.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveButtonReplyContent.cs
deleted file mode 100644
index 1fe95c67946d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveButtonReplyContent.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message Interactive button reply content for a user to business message. </summary>
-    public partial class AcsMessageInteractiveButtonReplyContent
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageInteractiveButtonReplyContent"/>. </summary>
-        internal AcsMessageInteractiveButtonReplyContent()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageInteractiveButtonReplyContent"/>. </summary>
-        /// <param name="buttonId"> The ID of the button. </param>
-        /// <param name="title"> The title of the button. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsMessageInteractiveButtonReplyContent(string buttonId, string title, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ButtonId = buttonId;
-            Title = title;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The ID of the button. </summary>
-        public string ButtonId { get; }
-        /// <summary> The title of the button. </summary>
-        public string Title { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveContent.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveContent.Serialization.cs
deleted file mode 100644
index 6ff87f62f04f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveContent.Serialization.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageInteractiveContent : IUtf8JsonSerializable, IJsonModel<AcsMessageInteractiveContent>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageInteractiveContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageInteractiveContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageInteractiveContent)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("type"u8);
-            writer.WriteStringValue(ReplyKind.ToString());
-            writer.WritePropertyName("buttonReply"u8);
-            writer.WriteObjectValue(ButtonReply, options);
-            writer.WritePropertyName("listReply"u8);
-            writer.WriteObjectValue(ListReply, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsMessageInteractiveContent IJsonModel<AcsMessageInteractiveContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageInteractiveContent)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageInteractiveContent(document.RootElement, options);
-        }
-
-        internal static AcsMessageInteractiveContent DeserializeAcsMessageInteractiveContent(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AcsInteractiveReplyKind type = default;
-            AcsMessageInteractiveButtonReplyContent buttonReply = default;
-            AcsMessageInteractiveListReplyContent listReply = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("type"u8))
-                {
-                    type = new AcsInteractiveReplyKind(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("buttonReply"u8))
-                {
-                    buttonReply = AcsMessageInteractiveButtonReplyContent.DeserializeAcsMessageInteractiveButtonReplyContent(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("listReply"u8))
-                {
-                    listReply = AcsMessageInteractiveListReplyContent.DeserializeAcsMessageInteractiveListReplyContent(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageInteractiveContent(type, buttonReply, listReply, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsMessageInteractiveContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageInteractiveContent)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageInteractiveContent IPersistableModel<AcsMessageInteractiveContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageInteractiveContent(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageInteractiveContent)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageInteractiveContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsMessageInteractiveContent FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageInteractiveContent(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveContent.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveContent.cs
deleted file mode 100644
index 0d59cf31c2ff..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveContent.cs
+++ /dev/null
@@ -1,88 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message Interactive Content. </summary>
-    public partial class AcsMessageInteractiveContent
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageInteractiveContent"/>. </summary>
-        /// <param name="replyKind"> The Message interactive reply type. </param>
-        /// <param name="buttonReply"> The Message Sent when a customer clicks a button. </param>
-        /// <param name="listReply"> The Message Sent when a customer selects an item from a list. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="buttonReply"/> or <paramref name="listReply"/> is null. </exception>
-        internal AcsMessageInteractiveContent(AcsInteractiveReplyKind replyKind, AcsMessageInteractiveButtonReplyContent buttonReply, AcsMessageInteractiveListReplyContent listReply)
-        {
-            Argument.AssertNotNull(buttonReply, nameof(buttonReply));
-            Argument.AssertNotNull(listReply, nameof(listReply));
-
-            ReplyKind = replyKind;
-            ButtonReply = buttonReply;
-            ListReply = listReply;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageInteractiveContent"/>. </summary>
-        /// <param name="replyKind"> The Message interactive reply type. </param>
-        /// <param name="buttonReply"> The Message Sent when a customer clicks a button. </param>
-        /// <param name="listReply"> The Message Sent when a customer selects an item from a list. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsMessageInteractiveContent(AcsInteractiveReplyKind replyKind, AcsMessageInteractiveButtonReplyContent buttonReply, AcsMessageInteractiveListReplyContent listReply, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ReplyKind = replyKind;
-            ButtonReply = buttonReply;
-            ListReply = listReply;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageInteractiveContent"/> for deserialization. </summary>
-        internal AcsMessageInteractiveContent()
-        {
-        }
-
-        /// <summary> The Message interactive reply type. </summary>
-        public AcsInteractiveReplyKind ReplyKind { get; }
-        /// <summary> The Message Sent when a customer clicks a button. </summary>
-        public AcsMessageInteractiveButtonReplyContent ButtonReply { get; }
-        /// <summary> The Message Sent when a customer selects an item from a list. </summary>
-        public AcsMessageInteractiveListReplyContent ListReply { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveListReplyContent.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveListReplyContent.Serialization.cs
deleted file mode 100644
index 12bbb0dc4500..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveListReplyContent.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageInteractiveListReplyContent : IUtf8JsonSerializable, IJsonModel<AcsMessageInteractiveListReplyContent>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageInteractiveListReplyContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageInteractiveListReplyContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveListReplyContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageInteractiveListReplyContent)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ListItemId))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(ListItemId);
-            }
-            if (Optional.IsDefined(Title))
-            {
-                writer.WritePropertyName("title"u8);
-                writer.WriteStringValue(Title);
-            }
-            if (Optional.IsDefined(Description))
-            {
-                writer.WritePropertyName("description"u8);
-                writer.WriteStringValue(Description);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsMessageInteractiveListReplyContent IJsonModel<AcsMessageInteractiveListReplyContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveListReplyContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageInteractiveListReplyContent)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageInteractiveListReplyContent(document.RootElement, options);
-        }
-
-        internal static AcsMessageInteractiveListReplyContent DeserializeAcsMessageInteractiveListReplyContent(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string title = default;
-            string description = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("title"u8))
-                {
-                    title = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("description"u8))
-                {
-                    description = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageInteractiveListReplyContent(id, title, description, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsMessageInteractiveListReplyContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveListReplyContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageInteractiveListReplyContent)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageInteractiveListReplyContent IPersistableModel<AcsMessageInteractiveListReplyContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageInteractiveListReplyContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageInteractiveListReplyContent(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageInteractiveListReplyContent)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageInteractiveListReplyContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsMessageInteractiveListReplyContent FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageInteractiveListReplyContent(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveListReplyContent.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveListReplyContent.cs
deleted file mode 100644
index fff70f8e670e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageInteractiveListReplyContent.cs
+++ /dev/null
@@ -1,73 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message Interactive list reply content for a user to business message. </summary>
-    public partial class AcsMessageInteractiveListReplyContent
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageInteractiveListReplyContent"/>. </summary>
-        internal AcsMessageInteractiveListReplyContent()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageInteractiveListReplyContent"/>. </summary>
-        /// <param name="listItemId"> The ID of the selected list item. </param>
-        /// <param name="title"> The title of the selected list item. </param>
-        /// <param name="description"> The description of the selected row. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsMessageInteractiveListReplyContent(string listItemId, string title, string description, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ListItemId = listItemId;
-            Title = title;
-            Description = description;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The ID of the selected list item. </summary>
-        public string ListItemId { get; }
-        /// <summary> The title of the selected list item. </summary>
-        public string Title { get; }
-        /// <summary> The description of the selected row. </summary>
-        public string Description { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageMediaContent.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageMediaContent.Serialization.cs
deleted file mode 100644
index c1b6362d3b52..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageMediaContent.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageMediaContent : IUtf8JsonSerializable, IJsonModel<AcsMessageMediaContent>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageMediaContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageMediaContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageMediaContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageMediaContent)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(MimeType))
-            {
-                writer.WritePropertyName("mimeType"u8);
-                writer.WriteStringValue(MimeType);
-            }
-            if (Optional.IsDefined(MediaId))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(MediaId);
-            }
-            if (Optional.IsDefined(FileName))
-            {
-                writer.WritePropertyName("fileName"u8);
-                writer.WriteStringValue(FileName);
-            }
-            if (Optional.IsDefined(Caption))
-            {
-                writer.WritePropertyName("caption"u8);
-                writer.WriteStringValue(Caption);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsMessageMediaContent IJsonModel<AcsMessageMediaContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageMediaContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageMediaContent)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageMediaContent(document.RootElement, options);
-        }
-
-        internal static AcsMessageMediaContent DeserializeAcsMessageMediaContent(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string mimeType = default;
-            string id = default;
-            string fileName = default;
-            string caption = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("mimeType"u8))
-                {
-                    mimeType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("fileName"u8))
-                {
-                    fileName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("caption"u8))
-                {
-                    caption = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageMediaContent(mimeType, id, fileName, caption, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsMessageMediaContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageMediaContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageMediaContent)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageMediaContent IPersistableModel<AcsMessageMediaContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageMediaContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageMediaContent(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageMediaContent)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageMediaContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsMessageMediaContent FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageMediaContent(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageMediaContent.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageMediaContent.cs
deleted file mode 100644
index a217e0538938..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageMediaContent.cs
+++ /dev/null
@@ -1,77 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Message Media Content. </summary>
-    public partial class AcsMessageMediaContent
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageMediaContent"/>. </summary>
-        internal AcsMessageMediaContent()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageMediaContent"/>. </summary>
-        /// <param name="mimeType"> The MIME type of the file this media represents. </param>
-        /// <param name="mediaId"> The media identifier. </param>
-        /// <param name="fileName"> The filename of the underlying media file as specified when uploaded. </param>
-        /// <param name="caption"> The caption for the media object, if supported and provided. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsMessageMediaContent(string mimeType, string mediaId, string fileName, string caption, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            MimeType = mimeType;
-            MediaId = mediaId;
-            FileName = fileName;
-            Caption = caption;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The MIME type of the file this media represents. </summary>
-        public string MimeType { get; }
-        /// <summary> The media identifier. </summary>
-        public string MediaId { get; }
-        /// <summary> The filename of the underlying media file as specified when uploaded. </summary>
-        public string FileName { get; }
-        /// <summary> The caption for the media object, if supported and provided. </summary>
-        public string Caption { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageReceivedEventData.Serialization.cs
deleted file mode 100644
index 29d76082dfa2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageReceivedEventData.Serialization.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsMessageReceivedEventData : IUtf8JsonSerializable, IJsonModel<AcsMessageReceivedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsMessageReceivedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsMessageReceivedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageReceivedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(Content))
-            {
-                writer.WritePropertyName("content"u8);
-                writer.WriteStringValue(Content);
-            }
-            writer.WritePropertyName("channelType"u8);
-            writer.WriteStringValue(ChannelKind.ToString());
-            writer.WritePropertyName("media"u8);
-            writer.WriteObjectValue(MediaContent, options);
-            writer.WritePropertyName("context"u8);
-            writer.WriteObjectValue(Context, options);
-            writer.WritePropertyName("button"u8);
-            writer.WriteObjectValue(Button, options);
-            writer.WritePropertyName("interactive"u8);
-            writer.WriteObjectValue(InteractiveContent, options);
-        }
-
-        AcsMessageReceivedEventData IJsonModel<AcsMessageReceivedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsMessageReceivedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsMessageReceivedEventData(document.RootElement, options);
-        }
-
-        internal static AcsMessageReceivedEventData DeserializeAcsMessageReceivedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string content = default;
-            AcsMessageChannelKind channelType = default;
-            AcsMessageMediaContent media = default;
-            AcsMessageContext context = default;
-            AcsMessageButtonContent button = default;
-            AcsMessageInteractiveContent interactive = default;
-            string @from = default;
-            string to = default;
-            DateTimeOffset receivedTimeStamp = default;
-            AcsMessageChannelEventError error = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("content"u8))
-                {
-                    content = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelType"u8))
-                {
-                    channelType = new AcsMessageChannelKind(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("media"u8))
-                {
-                    media = AcsMessageMediaContent.DeserializeAcsMessageMediaContent(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("context"u8))
-                {
-                    context = AcsMessageContext.DeserializeAcsMessageContext(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("button"u8))
-                {
-                    button = AcsMessageButtonContent.DeserializeAcsMessageButtonContent(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("interactive"u8))
-                {
-                    interactive = AcsMessageInteractiveContent.DeserializeAcsMessageInteractiveContent(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("from"u8))
-                {
-                    @from = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("to"u8))
-                {
-                    to = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("receivedTimeStamp"u8))
-                {
-                    receivedTimeStamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("error"u8))
-                {
-                    error = AcsMessageChannelEventError.DeserializeAcsMessageChannelEventError(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsMessageReceivedEventData(
-                @from,
-                to,
-                receivedTimeStamp,
-                error,
-                serializedAdditionalRawData,
-                content,
-                channelType,
-                media,
-                context,
-                button,
-                interactive);
-        }
-
-        BinaryData IPersistableModel<AcsMessageReceivedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageReceivedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsMessageReceivedEventData IPersistableModel<AcsMessageReceivedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsMessageReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsMessageReceivedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsMessageReceivedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsMessageReceivedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsMessageReceivedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsMessageReceivedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageReceivedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageReceivedEventData.cs
deleted file mode 100644
index b7435b051bdf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsMessageReceivedEventData.cs
+++ /dev/null
@@ -1,80 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.AdvancedMessageReceived event. </summary>
-    public partial class AcsMessageReceivedEventData : AcsMessageEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsMessageReceivedEventData"/>. </summary>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <param name="channelKind"> The message channel type. </param>
-        /// <param name="mediaContent"> The received message media content. </param>
-        /// <param name="context"> The received message context. </param>
-        /// <param name="button"> The received message button content. </param>
-        /// <param name="interactiveContent"> The received message interactive content. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="error"/>, <paramref name="mediaContent"/>, <paramref name="context"/>, <paramref name="button"/> or <paramref name="interactiveContent"/> is null. </exception>
-        internal AcsMessageReceivedEventData(DateTimeOffset receivedTimestamp, AcsMessageChannelEventError error, AcsMessageChannelKind channelKind, AcsMessageMediaContent mediaContent, AcsMessageContext context, AcsMessageButtonContent button, AcsMessageInteractiveContent interactiveContent) : base(receivedTimestamp, error)
-        {
-            Argument.AssertNotNull(error, nameof(error));
-            Argument.AssertNotNull(mediaContent, nameof(mediaContent));
-            Argument.AssertNotNull(context, nameof(context));
-            Argument.AssertNotNull(button, nameof(button));
-            Argument.AssertNotNull(interactiveContent, nameof(interactiveContent));
-
-            ChannelKind = channelKind;
-            MediaContent = mediaContent;
-            Context = context;
-            Button = button;
-            InteractiveContent = interactiveContent;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageReceivedEventData"/>. </summary>
-        /// <param name="from"> The message sender. </param>
-        /// <param name="to"> The message recipient. </param>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="content"> The message content. </param>
-        /// <param name="channelKind"> The message channel type. </param>
-        /// <param name="mediaContent"> The received message media content. </param>
-        /// <param name="context"> The received message context. </param>
-        /// <param name="button"> The received message button content. </param>
-        /// <param name="interactiveContent"> The received message interactive content. </param>
-        internal AcsMessageReceivedEventData(string @from, string to, DateTimeOffset receivedTimestamp, AcsMessageChannelEventError error, IDictionary<string, BinaryData> serializedAdditionalRawData, string content, AcsMessageChannelKind channelKind, AcsMessageMediaContent mediaContent, AcsMessageContext context, AcsMessageButtonContent button, AcsMessageInteractiveContent interactiveContent) : base(@from, to, receivedTimestamp, error, serializedAdditionalRawData)
-        {
-            Content = content;
-            ChannelKind = channelKind;
-            MediaContent = mediaContent;
-            Context = context;
-            Button = button;
-            InteractiveContent = interactiveContent;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsMessageReceivedEventData"/> for deserialization. </summary>
-        internal AcsMessageReceivedEventData()
-        {
-        }
-
-        /// <summary> The message content. </summary>
-        public string Content { get; }
-        /// <summary> The message channel type. </summary>
-        public AcsMessageChannelKind ChannelKind { get; }
-        /// <summary> The received message media content. </summary>
-        public AcsMessageMediaContent MediaContent { get; }
-        /// <summary> The received message context. </summary>
-        public AcsMessageContext Context { get; }
-        /// <summary> The received message button content. </summary>
-        public AcsMessageButtonContent Button { get; }
-        /// <summary> The received message interactive content. </summary>
-        public AcsMessageInteractiveContent InteractiveContent { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingChunkInfoProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingChunkInfoProperties.Serialization.cs
deleted file mode 100644
index a8f2e2d3be36..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingChunkInfoProperties.Serialization.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRecordingChunkInfoProperties : IUtf8JsonSerializable, IJsonModel<AcsRecordingChunkInfoProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRecordingChunkInfoProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRecordingChunkInfoProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingChunkInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRecordingChunkInfoProperties)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(DocumentId))
-            {
-                writer.WritePropertyName("documentId"u8);
-                writer.WriteStringValue(DocumentId);
-            }
-            if (Optional.IsDefined(Index))
-            {
-                writer.WritePropertyName("index"u8);
-                writer.WriteNumberValue(Index.Value);
-            }
-            if (Optional.IsDefined(EndReason))
-            {
-                writer.WritePropertyName("endReason"u8);
-                writer.WriteStringValue(EndReason);
-            }
-            if (Optional.IsDefined(MetadataLocation))
-            {
-                writer.WritePropertyName("metadataLocation"u8);
-                writer.WriteStringValue(MetadataLocation);
-            }
-            if (Optional.IsDefined(ContentLocation))
-            {
-                writer.WritePropertyName("contentLocation"u8);
-                writer.WriteStringValue(ContentLocation);
-            }
-            if (Optional.IsDefined(DeleteLocation))
-            {
-                writer.WritePropertyName("deleteLocation"u8);
-                writer.WriteStringValue(DeleteLocation);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRecordingChunkInfoProperties IJsonModel<AcsRecordingChunkInfoProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingChunkInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRecordingChunkInfoProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRecordingChunkInfoProperties(document.RootElement, options);
-        }
-
-        internal static AcsRecordingChunkInfoProperties DeserializeAcsRecordingChunkInfoProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string documentId = default;
-            long? index = default;
-            string endReason = default;
-            string metadataLocation = default;
-            string contentLocation = default;
-            string deleteLocation = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("documentId"u8))
-                {
-                    documentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("index"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    index = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("endReason"u8))
-                {
-                    endReason = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("metadataLocation"u8))
-                {
-                    metadataLocation = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("contentLocation"u8))
-                {
-                    contentLocation = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("deleteLocation"u8))
-                {
-                    deleteLocation = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRecordingChunkInfoProperties(
-                documentId,
-                index,
-                endReason,
-                metadataLocation,
-                contentLocation,
-                deleteLocation,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRecordingChunkInfoProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingChunkInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRecordingChunkInfoProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRecordingChunkInfoProperties IPersistableModel<AcsRecordingChunkInfoProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingChunkInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRecordingChunkInfoProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRecordingChunkInfoProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRecordingChunkInfoProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRecordingChunkInfoProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRecordingChunkInfoProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingChunkInfoProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingChunkInfoProperties.cs
deleted file mode 100644
index e27b518ff320..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingChunkInfoProperties.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema for all properties of  Recording Chunk Information. </summary>
-    public partial class AcsRecordingChunkInfoProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRecordingChunkInfoProperties"/>. </summary>
-        internal AcsRecordingChunkInfoProperties()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRecordingChunkInfoProperties"/>. </summary>
-        /// <param name="documentId"> The documentId of the recording chunk. </param>
-        /// <param name="index"> The index of the recording chunk. </param>
-        /// <param name="endReason"> The reason for ending the recording chunk. </param>
-        /// <param name="metadataLocation"> The location of the metadata for this chunk. </param>
-        /// <param name="contentLocation"> The location of the content for this chunk. </param>
-        /// <param name="deleteLocation"> The location to delete all chunk storage. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRecordingChunkInfoProperties(string documentId, long? index, string endReason, string metadataLocation, string contentLocation, string deleteLocation, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            DocumentId = documentId;
-            Index = index;
-            EndReason = endReason;
-            MetadataLocation = metadataLocation;
-            ContentLocation = contentLocation;
-            DeleteLocation = deleteLocation;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The documentId of the recording chunk. </summary>
-        public string DocumentId { get; }
-        /// <summary> The index of the recording chunk. </summary>
-        public long? Index { get; }
-        /// <summary> The reason for ending the recording chunk. </summary>
-        public string EndReason { get; }
-        /// <summary> The location of the metadata for this chunk. </summary>
-        public string MetadataLocation { get; }
-        /// <summary> The location of the content for this chunk. </summary>
-        public string ContentLocation { get; }
-        /// <summary> The location to delete all chunk storage. </summary>
-        public string DeleteLocation { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingFileStatusUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingFileStatusUpdatedEventData.Serialization.cs
deleted file mode 100644
index 395739dfd570..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingFileStatusUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRecordingFileStatusUpdatedEventData : IUtf8JsonSerializable, IJsonModel<AcsRecordingFileStatusUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRecordingFileStatusUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRecordingFileStatusUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingFileStatusUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRecordingFileStatusUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("recordingStorageInfo"u8);
-            writer.WriteObjectValue(RecordingStorageInfo, options);
-            writer.WritePropertyName("recordingStartTime"u8);
-            writer.WriteStringValue(RecordingStartTime, "O");
-            if (Optional.IsDefined(RecordingDurationMs))
-            {
-                writer.WritePropertyName("recordingDurationMs"u8);
-                writer.WriteNumberValue(RecordingDurationMs.Value);
-            }
-            writer.WritePropertyName("recordingContentType"u8);
-            writer.WriteStringValue(RecordingContentType.ToString());
-            writer.WritePropertyName("recordingChannelType"u8);
-            writer.WriteStringValue(RecordingChannelKind.ToString());
-            writer.WritePropertyName("recordingFormatType"u8);
-            writer.WriteStringValue(RecordingFormatType.ToString());
-            if (Optional.IsDefined(SessionEndReason))
-            {
-                writer.WritePropertyName("sessionEndReason"u8);
-                writer.WriteStringValue(SessionEndReason);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRecordingFileStatusUpdatedEventData IJsonModel<AcsRecordingFileStatusUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingFileStatusUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRecordingFileStatusUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRecordingFileStatusUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRecordingFileStatusUpdatedEventData DeserializeAcsRecordingFileStatusUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AcsRecordingStorageInfoProperties recordingStorageInfo = default;
-            DateTimeOffset recordingStartTime = default;
-            long? recordingDurationMs = default;
-            RecordingContentType recordingContentType = default;
-            RecordingChannelType recordingChannelType = default;
-            RecordingFormatType recordingFormatType = default;
-            string sessionEndReason = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("recordingStorageInfo"u8))
-                {
-                    recordingStorageInfo = AcsRecordingStorageInfoProperties.DeserializeAcsRecordingStorageInfoProperties(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("recordingStartTime"u8))
-                {
-                    recordingStartTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("recordingDurationMs"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    recordingDurationMs = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("recordingContentType"u8))
-                {
-                    recordingContentType = new RecordingContentType(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("recordingChannelType"u8))
-                {
-                    recordingChannelType = new RecordingChannelType(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("recordingFormatType"u8))
-                {
-                    recordingFormatType = new RecordingFormatType(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("sessionEndReason"u8))
-                {
-                    sessionEndReason = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRecordingFileStatusUpdatedEventData(
-                recordingStorageInfo,
-                recordingStartTime,
-                recordingDurationMs,
-                recordingContentType,
-                recordingChannelType,
-                recordingFormatType,
-                sessionEndReason,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRecordingFileStatusUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingFileStatusUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRecordingFileStatusUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRecordingFileStatusUpdatedEventData IPersistableModel<AcsRecordingFileStatusUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingFileStatusUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRecordingFileStatusUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRecordingFileStatusUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRecordingFileStatusUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRecordingFileStatusUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRecordingFileStatusUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingFileStatusUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingFileStatusUpdatedEventData.cs
deleted file mode 100644
index a5e50aee2cc8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingFileStatusUpdatedEventData.cs
+++ /dev/null
@@ -1,107 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RecordingFileStatusUpdated event. </summary>
-    public partial class AcsRecordingFileStatusUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRecordingFileStatusUpdatedEventData"/>. </summary>
-        /// <param name="recordingStorageInfo"> The details of recording storage information. </param>
-        /// <param name="recordingStartTime"> The time at which the recording started. </param>
-        /// <param name="recordingContentType"> The recording content type- AudioVideo, or Audio. </param>
-        /// <param name="recordingChannelKind"> The recording  channel type - Mixed, Unmixed. </param>
-        /// <param name="recordingFormatType"> The recording format type - Mp4, Mp3, Wav. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recordingStorageInfo"/> is null. </exception>
-        internal AcsRecordingFileStatusUpdatedEventData(AcsRecordingStorageInfoProperties recordingStorageInfo, DateTimeOffset recordingStartTime, RecordingContentType recordingContentType, RecordingChannelType recordingChannelKind, RecordingFormatType recordingFormatType)
-        {
-            Argument.AssertNotNull(recordingStorageInfo, nameof(recordingStorageInfo));
-
-            RecordingStorageInfo = recordingStorageInfo;
-            RecordingStartTime = recordingStartTime;
-            RecordingContentType = recordingContentType;
-            RecordingChannelKind = recordingChannelKind;
-            RecordingFormatType = recordingFormatType;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRecordingFileStatusUpdatedEventData"/>. </summary>
-        /// <param name="recordingStorageInfo"> The details of recording storage information. </param>
-        /// <param name="recordingStartTime"> The time at which the recording started. </param>
-        /// <param name="recordingDurationMs"> The recording duration in milliseconds. </param>
-        /// <param name="recordingContentType"> The recording content type- AudioVideo, or Audio. </param>
-        /// <param name="recordingChannelKind"> The recording  channel type - Mixed, Unmixed. </param>
-        /// <param name="recordingFormatType"> The recording format type - Mp4, Mp3, Wav. </param>
-        /// <param name="sessionEndReason"> The reason for ending recording session. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRecordingFileStatusUpdatedEventData(AcsRecordingStorageInfoProperties recordingStorageInfo, DateTimeOffset recordingStartTime, long? recordingDurationMs, RecordingContentType recordingContentType, RecordingChannelType recordingChannelKind, RecordingFormatType recordingFormatType, string sessionEndReason, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            RecordingStorageInfo = recordingStorageInfo;
-            RecordingStartTime = recordingStartTime;
-            RecordingDurationMs = recordingDurationMs;
-            RecordingContentType = recordingContentType;
-            RecordingChannelKind = recordingChannelKind;
-            RecordingFormatType = recordingFormatType;
-            SessionEndReason = sessionEndReason;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRecordingFileStatusUpdatedEventData"/> for deserialization. </summary>
-        internal AcsRecordingFileStatusUpdatedEventData()
-        {
-        }
-
-        /// <summary> The details of recording storage information. </summary>
-        public AcsRecordingStorageInfoProperties RecordingStorageInfo { get; }
-        /// <summary> The time at which the recording started. </summary>
-        public DateTimeOffset RecordingStartTime { get; }
-        /// <summary> The recording duration in milliseconds. </summary>
-        public long? RecordingDurationMs { get; }
-        /// <summary> The recording content type- AudioVideo, or Audio. </summary>
-        public RecordingContentType RecordingContentType { get; }
-        /// <summary> The recording  channel type - Mixed, Unmixed. </summary>
-        public RecordingChannelType RecordingChannelKind { get; }
-        /// <summary> The recording format type - Mp4, Mp3, Wav. </summary>
-        public RecordingFormatType RecordingFormatType { get; }
-        /// <summary> The reason for ending recording session. </summary>
-        public string SessionEndReason { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingStorageInfoProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingStorageInfoProperties.Serialization.cs
deleted file mode 100644
index b982628a55e1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingStorageInfoProperties.Serialization.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRecordingStorageInfoProperties : IUtf8JsonSerializable, IJsonModel<AcsRecordingStorageInfoProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRecordingStorageInfoProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRecordingStorageInfoProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingStorageInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRecordingStorageInfoProperties)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("recordingChunks"u8);
-            writer.WriteStartArray();
-            foreach (var item in RecordingChunks)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRecordingStorageInfoProperties IJsonModel<AcsRecordingStorageInfoProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingStorageInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRecordingStorageInfoProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRecordingStorageInfoProperties(document.RootElement, options);
-        }
-
-        internal static AcsRecordingStorageInfoProperties DeserializeAcsRecordingStorageInfoProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<AcsRecordingChunkInfoProperties> recordingChunks = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("recordingChunks"u8))
-                {
-                    List<AcsRecordingChunkInfoProperties> array = new List<AcsRecordingChunkInfoProperties>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRecordingChunkInfoProperties.DeserializeAcsRecordingChunkInfoProperties(item, options));
-                    }
-                    recordingChunks = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRecordingStorageInfoProperties(recordingChunks, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRecordingStorageInfoProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingStorageInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRecordingStorageInfoProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRecordingStorageInfoProperties IPersistableModel<AcsRecordingStorageInfoProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRecordingStorageInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRecordingStorageInfoProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRecordingStorageInfoProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRecordingStorageInfoProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRecordingStorageInfoProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRecordingStorageInfoProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingStorageInfoProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingStorageInfoProperties.cs
deleted file mode 100644
index bc7b2ef0b31b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRecordingStorageInfoProperties.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema for all properties of Recording Storage Information. </summary>
-    public partial class AcsRecordingStorageInfoProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRecordingStorageInfoProperties"/>. </summary>
-        /// <param name="recordingChunks"> List of details of recording chunks information. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="recordingChunks"/> is null. </exception>
-        internal AcsRecordingStorageInfoProperties(IEnumerable<AcsRecordingChunkInfoProperties> recordingChunks)
-        {
-            Argument.AssertNotNull(recordingChunks, nameof(recordingChunks));
-
-            RecordingChunks = recordingChunks.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRecordingStorageInfoProperties"/>. </summary>
-        /// <param name="recordingChunks"> List of details of recording chunks information. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRecordingStorageInfoProperties(IReadOnlyList<AcsRecordingChunkInfoProperties> recordingChunks, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            RecordingChunks = recordingChunks;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRecordingStorageInfoProperties"/> for deserialization. </summary>
-        internal AcsRecordingStorageInfoProperties()
-        {
-        }
-
-        /// <summary> List of details of recording chunks information. </summary>
-        public IReadOnlyList<AcsRecordingChunkInfoProperties> RecordingChunks { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterChannelConfiguration.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterChannelConfiguration.Serialization.cs
deleted file mode 100644
index 135e0f74c1e6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterChannelConfiguration.Serialization.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterChannelConfiguration : IUtf8JsonSerializable, IJsonModel<AcsRouterChannelConfiguration>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterChannelConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterChannelConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterChannelConfiguration>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterChannelConfiguration)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ChannelId))
-            {
-                writer.WritePropertyName("channelId"u8);
-                writer.WriteStringValue(ChannelId);
-            }
-            if (Optional.IsDefined(CapacityCostPerJob))
-            {
-                writer.WritePropertyName("capacityCostPerJob"u8);
-                writer.WriteNumberValue(CapacityCostPerJob.Value);
-            }
-            if (Optional.IsDefined(MaxNumberOfJobs))
-            {
-                writer.WritePropertyName("maxNumberOfJobs"u8);
-                writer.WriteNumberValue(MaxNumberOfJobs.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRouterChannelConfiguration IJsonModel<AcsRouterChannelConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterChannelConfiguration>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterChannelConfiguration)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterChannelConfiguration(document.RootElement, options);
-        }
-
-        internal static AcsRouterChannelConfiguration DeserializeAcsRouterChannelConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string channelId = default;
-            int? capacityCostPerJob = default;
-            int? maxNumberOfJobs = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("capacityCostPerJob"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    capacityCostPerJob = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("maxNumberOfJobs"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    maxNumberOfJobs = property.Value.GetInt32();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterChannelConfiguration(channelId, capacityCostPerJob, maxNumberOfJobs, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRouterChannelConfiguration>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterChannelConfiguration>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterChannelConfiguration)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterChannelConfiguration IPersistableModel<AcsRouterChannelConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterChannelConfiguration>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterChannelConfiguration(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterChannelConfiguration)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterChannelConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRouterChannelConfiguration FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterChannelConfiguration(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterChannelConfiguration.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterChannelConfiguration.cs
deleted file mode 100644
index 9b3d3e8de17f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterChannelConfiguration.cs
+++ /dev/null
@@ -1,73 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Router Channel Configuration. </summary>
-    public partial class AcsRouterChannelConfiguration
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterChannelConfiguration"/>. </summary>
-        internal AcsRouterChannelConfiguration()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterChannelConfiguration"/>. </summary>
-        /// <param name="channelId"> Channel ID for Router Job. </param>
-        /// <param name="capacityCostPerJob"> Capacity Cost Per Job for Router Job. </param>
-        /// <param name="maxNumberOfJobs"> Max Number of Jobs for Router Job. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRouterChannelConfiguration(string channelId, int? capacityCostPerJob, int? maxNumberOfJobs, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ChannelId = channelId;
-            CapacityCostPerJob = capacityCostPerJob;
-            MaxNumberOfJobs = maxNumberOfJobs;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Channel ID for Router Job. </summary>
-        public string ChannelId { get; }
-        /// <summary> Capacity Cost Per Job for Router Job. </summary>
-        public int? CapacityCostPerJob { get; }
-        /// <summary> Max Number of Jobs for Router Job. </summary>
-        public int? MaxNumberOfJobs { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterCommunicationError.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterCommunicationError.Serialization.cs
deleted file mode 100644
index ac35ce20f6dd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterCommunicationError.Serialization.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterCommunicationError : IUtf8JsonSerializable, IJsonModel<AcsRouterCommunicationError>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterCommunicationError>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterCommunicationError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterCommunicationError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterCommunicationError)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Code))
-            {
-                writer.WritePropertyName("code"u8);
-                writer.WriteStringValue(Code);
-            }
-            if (Optional.IsDefined(Message))
-            {
-                writer.WritePropertyName("message"u8);
-                writer.WriteStringValue(Message);
-            }
-            if (Optional.IsDefined(Target))
-            {
-                writer.WritePropertyName("target"u8);
-                writer.WriteStringValue(Target);
-            }
-            writer.WritePropertyName("innererror"u8);
-            writer.WriteObjectValue(Innererror, options);
-            writer.WritePropertyName("details"u8);
-            writer.WriteStartArray();
-            foreach (var item in Details)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRouterCommunicationError IJsonModel<AcsRouterCommunicationError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterCommunicationError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterCommunicationError)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterCommunicationError(document.RootElement, options);
-        }
-
-        internal static AcsRouterCommunicationError DeserializeAcsRouterCommunicationError(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string code = default;
-            string message = default;
-            string target = default;
-            AcsRouterCommunicationError innererror = default;
-            IReadOnlyList<AcsRouterCommunicationError> details = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("code"u8))
-                {
-                    code = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("message"u8))
-                {
-                    message = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("target"u8))
-                {
-                    target = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("innererror"u8))
-                {
-                    innererror = DeserializeAcsRouterCommunicationError(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("details"u8))
-                {
-                    List<AcsRouterCommunicationError> array = new List<AcsRouterCommunicationError>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(DeserializeAcsRouterCommunicationError(item, options));
-                    }
-                    details = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterCommunicationError(
-                code,
-                message,
-                target,
-                innererror,
-                details,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRouterCommunicationError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterCommunicationError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterCommunicationError)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterCommunicationError IPersistableModel<AcsRouterCommunicationError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterCommunicationError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterCommunicationError(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterCommunicationError)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterCommunicationError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRouterCommunicationError FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterCommunicationError(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterCommunicationError.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterCommunicationError.cs
deleted file mode 100644
index 35ae98ef1222..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterCommunicationError.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Router Communication Error. </summary>
-    public partial class AcsRouterCommunicationError
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterCommunicationError"/>. </summary>
-        /// <param name="innererror"> Router Communication Inner Error. </param>
-        /// <param name="details"> List of Router Communication Errors. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="innererror"/> or <paramref name="details"/> is null. </exception>
-        internal AcsRouterCommunicationError(AcsRouterCommunicationError innererror, IEnumerable<AcsRouterCommunicationError> details)
-        {
-            Argument.AssertNotNull(innererror, nameof(innererror));
-            Argument.AssertNotNull(details, nameof(details));
-
-            Innererror = innererror;
-            Details = details.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterCommunicationError"/>. </summary>
-        /// <param name="code"> Router Communication Error Code. </param>
-        /// <param name="message"> Router Communication Error Message. </param>
-        /// <param name="target"> Router Communication Error Target. </param>
-        /// <param name="innererror"> Router Communication Inner Error. </param>
-        /// <param name="details"> List of Router Communication Errors. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRouterCommunicationError(string code, string message, string target, AcsRouterCommunicationError innererror, IReadOnlyList<AcsRouterCommunicationError> details, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Code = code;
-            Message = message;
-            Target = target;
-            Innererror = innererror;
-            Details = details;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterCommunicationError"/> for deserialization. </summary>
-        internal AcsRouterCommunicationError()
-        {
-        }
-
-        /// <summary> Router Communication Error Code. </summary>
-        public string Code { get; }
-        /// <summary> Router Communication Error Message. </summary>
-        public string Message { get; }
-        /// <summary> Router Communication Error Target. </summary>
-        public string Target { get; }
-        /// <summary> Router Communication Inner Error. </summary>
-        public AcsRouterCommunicationError Innererror { get; }
-        /// <summary> List of Router Communication Errors. </summary>
-        public IReadOnlyList<AcsRouterCommunicationError> Details { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterEventData.Serialization.cs
deleted file mode 100644
index 5b32185ff864..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterEventData.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(JobId))
-            {
-                writer.WritePropertyName("jobId"u8);
-                writer.WriteStringValue(JobId);
-            }
-            if (Optional.IsDefined(ChannelReference))
-            {
-                writer.WritePropertyName("channelReference"u8);
-                writer.WriteStringValue(ChannelReference);
-            }
-            if (Optional.IsDefined(ChannelId))
-            {
-                writer.WritePropertyName("channelId"u8);
-                writer.WriteStringValue(ChannelId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRouterEventData IJsonModel<AcsRouterEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterEventData DeserializeAcsRouterEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterEventData(jobId, channelReference, channelId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRouterEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterEventData IPersistableModel<AcsRouterEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRouterEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterEventData.cs
deleted file mode 100644
index ef5256da1f16..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterEventData.cs
+++ /dev/null
@@ -1,73 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all Router events. </summary>
-    public partial class AcsRouterEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterEventData"/>. </summary>
-        internal AcsRouterEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRouterEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            JobId = jobId;
-            ChannelReference = channelReference;
-            ChannelId = channelId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Router Event Job ID. </summary>
-        public string JobId { get; }
-        /// <summary> Router Event Channel Reference. </summary>
-        public string ChannelReference { get; }
-        /// <summary> Router Event Channel ID. </summary>
-        public string ChannelId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCancelledEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCancelledEventData.Serialization.cs
deleted file mode 100644
index e15c613a25c7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCancelledEventData.Serialization.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobCancelledEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobCancelledEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobCancelledEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobCancelledEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobCancelledEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(Note))
-            {
-                writer.WritePropertyName("note"u8);
-                writer.WriteStringValue(Note);
-            }
-            if (Optional.IsDefined(DispositionCode))
-            {
-                writer.WritePropertyName("dispositionCode"u8);
-                writer.WriteStringValue(DispositionCode);
-            }
-        }
-
-        AcsRouterJobCancelledEventData IJsonModel<AcsRouterJobCancelledEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobCancelledEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobCancelledEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobCancelledEventData DeserializeAcsRouterJobCancelledEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string note = default;
-            string dispositionCode = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("note"u8))
-                {
-                    note = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("dispositionCode"u8))
-                {
-                    dispositionCode = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobCancelledEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                note,
-                dispositionCode);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobCancelledEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobCancelledEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobCancelledEventData IPersistableModel<AcsRouterJobCancelledEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobCancelledEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobCancelledEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobCancelledEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobCancelledEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobCancelledEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCancelledEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCancelledEventData.cs
deleted file mode 100644
index ec856a4acd43..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCancelledEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobCancelled event. </summary>
-    public partial class AcsRouterJobCancelledEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobCancelledEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/> or <paramref name="tags"/> is null. </exception>
-        internal AcsRouterJobCancelledEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobCancelledEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="note"> Router Job Note. </param>
-        /// <param name="dispositionCode"> Router Job Disposition Code. </param>
-        internal AcsRouterJobCancelledEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, string note, string dispositionCode) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            Note = note;
-            DispositionCode = dispositionCode;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobCancelledEventData"/> for deserialization. </summary>
-        internal AcsRouterJobCancelledEventData()
-        {
-        }
-
-        /// <summary> Router Job Note. </summary>
-        public string Note { get; }
-        /// <summary> Router Job Disposition Code. </summary>
-        public string DispositionCode { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassificationFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassificationFailedEventData.Serialization.cs
deleted file mode 100644
index 090664429c16..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassificationFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobClassificationFailedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobClassificationFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobClassificationFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobClassificationFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClassificationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobClassificationFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(ClassificationPolicyId))
-            {
-                writer.WritePropertyName("classificationPolicyId"u8);
-                writer.WriteStringValue(ClassificationPolicyId);
-            }
-            writer.WritePropertyName("errors"u8);
-            writer.WriteStartArray();
-            foreach (var item in Errors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        AcsRouterJobClassificationFailedEventData IJsonModel<AcsRouterJobClassificationFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClassificationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobClassificationFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobClassificationFailedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobClassificationFailedEventData DeserializeAcsRouterJobClassificationFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string classificationPolicyId = default;
-            IReadOnlyList<AcsRouterCommunicationError> errors = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("classificationPolicyId"u8))
-                {
-                    classificationPolicyId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("errors"u8))
-                {
-                    List<AcsRouterCommunicationError> array = new List<AcsRouterCommunicationError>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterCommunicationError.DeserializeAcsRouterCommunicationError(item, options));
-                    }
-                    errors = array;
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobClassificationFailedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                classificationPolicyId,
-                errors);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobClassificationFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClassificationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobClassificationFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobClassificationFailedEventData IPersistableModel<AcsRouterJobClassificationFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClassificationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobClassificationFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobClassificationFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobClassificationFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobClassificationFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobClassificationFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassificationFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassificationFailedEventData.cs
deleted file mode 100644
index 0dde294286a4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassificationFailedEventData.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobClassificationFailed event. </summary>
-    public partial class AcsRouterJobClassificationFailedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClassificationFailedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="errors"> Router Job Classification Failed Errors. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/>, <paramref name="tags"/> or <paramref name="errors"/> is null. </exception>
-        internal AcsRouterJobClassificationFailedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IEnumerable<AcsRouterCommunicationError> errors) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(errors, nameof(errors));
-
-            Errors = errors.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClassificationFailedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="classificationPolicyId"> Router Job Classification Policy Id. </param>
-        /// <param name="errors"> Router Job Classification Failed Errors. </param>
-        internal AcsRouterJobClassificationFailedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, string classificationPolicyId, IReadOnlyList<AcsRouterCommunicationError> errors) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            ClassificationPolicyId = classificationPolicyId;
-            Errors = errors;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClassificationFailedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobClassificationFailedEventData()
-        {
-        }
-
-        /// <summary> Router Job Classification Policy Id. </summary>
-        public string ClassificationPolicyId { get; }
-        /// <summary> Router Job Classification Failed Errors. </summary>
-        public IReadOnlyList<AcsRouterCommunicationError> Errors { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassifiedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassifiedEventData.Serialization.cs
deleted file mode 100644
index 0b0a9bd354ec..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassifiedEventData.Serialization.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobClassifiedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobClassifiedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobClassifiedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobClassifiedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClassifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobClassifiedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("queueDetails"u8);
-            writer.WriteObjectValue(QueueDetails, options);
-            if (Optional.IsDefined(ClassificationPolicyId))
-            {
-                writer.WritePropertyName("classificationPolicyId"u8);
-                writer.WriteStringValue(ClassificationPolicyId);
-            }
-            if (Optional.IsDefined(Priority))
-            {
-                writer.WritePropertyName("priority"u8);
-                writer.WriteNumberValue(Priority.Value);
-            }
-            writer.WritePropertyName("attachedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in AttachedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        AcsRouterJobClassifiedEventData IJsonModel<AcsRouterJobClassifiedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClassifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobClassifiedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobClassifiedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobClassifiedEventData DeserializeAcsRouterJobClassifiedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AcsRouterQueueDetails queueDetails = default;
-            string classificationPolicyId = default;
-            int? priority = default;
-            IReadOnlyList<AcsRouterWorkerSelector> attachedWorkerSelectors = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queueDetails"u8))
-                {
-                    queueDetails = AcsRouterQueueDetails.DeserializeAcsRouterQueueDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("classificationPolicyId"u8))
-                {
-                    classificationPolicyId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("priority"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    priority = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("attachedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    attachedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobClassifiedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                queueDetails,
-                classificationPolicyId,
-                priority,
-                attachedWorkerSelectors);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobClassifiedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClassifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobClassifiedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobClassifiedEventData IPersistableModel<AcsRouterJobClassifiedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClassifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobClassifiedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobClassifiedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobClassifiedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobClassifiedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobClassifiedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassifiedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassifiedEventData.cs
deleted file mode 100644
index db2dbdd50165..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClassifiedEventData.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;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobClassified event. </summary>
-    public partial class AcsRouterJobClassifiedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClassifiedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="queueDetails"> Router Job Queue Info. </param>
-        /// <param name="attachedWorkerSelectors"> Router Job Attached Worker Selector. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/>, <paramref name="tags"/>, <paramref name="queueDetails"/> or <paramref name="attachedWorkerSelectors"/> is null. </exception>
-        internal AcsRouterJobClassifiedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, AcsRouterQueueDetails queueDetails, IEnumerable<AcsRouterWorkerSelector> attachedWorkerSelectors) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(queueDetails, nameof(queueDetails));
-            Argument.AssertNotNull(attachedWorkerSelectors, nameof(attachedWorkerSelectors));
-
-            QueueDetails = queueDetails;
-            AttachedWorkerSelectors = attachedWorkerSelectors.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClassifiedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="queueDetails"> Router Job Queue Info. </param>
-        /// <param name="classificationPolicyId"> Router Job Classification Policy Id. </param>
-        /// <param name="priority"> Router Job Priority. </param>
-        /// <param name="attachedWorkerSelectors"> Router Job Attached Worker Selector. </param>
-        internal AcsRouterJobClassifiedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, AcsRouterQueueDetails queueDetails, string classificationPolicyId, int? priority, IReadOnlyList<AcsRouterWorkerSelector> attachedWorkerSelectors) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            QueueDetails = queueDetails;
-            ClassificationPolicyId = classificationPolicyId;
-            Priority = priority;
-            AttachedWorkerSelectors = attachedWorkerSelectors;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClassifiedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobClassifiedEventData()
-        {
-        }
-
-        /// <summary> Router Job Queue Info. </summary>
-        public AcsRouterQueueDetails QueueDetails { get; }
-        /// <summary> Router Job Classification Policy Id. </summary>
-        public string ClassificationPolicyId { get; }
-        /// <summary> Router Job Priority. </summary>
-        public int? Priority { get; }
-        /// <summary> Router Job Attached Worker Selector. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> AttachedWorkerSelectors { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClosedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClosedEventData.Serialization.cs
deleted file mode 100644
index b9c7d767ce73..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClosedEventData.Serialization.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobClosedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobClosedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobClosedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobClosedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClosedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobClosedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(AssignmentId))
-            {
-                writer.WritePropertyName("assignmentId"u8);
-                writer.WriteStringValue(AssignmentId);
-            }
-            if (Optional.IsDefined(WorkerId))
-            {
-                writer.WritePropertyName("workerId"u8);
-                writer.WriteStringValue(WorkerId);
-            }
-            if (Optional.IsDefined(DispositionCode))
-            {
-                writer.WritePropertyName("dispositionCode"u8);
-                writer.WriteStringValue(DispositionCode);
-            }
-        }
-
-        AcsRouterJobClosedEventData IJsonModel<AcsRouterJobClosedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClosedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobClosedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobClosedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobClosedEventData DeserializeAcsRouterJobClosedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string assignmentId = default;
-            string workerId = default;
-            string dispositionCode = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("assignmentId"u8))
-                {
-                    assignmentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("dispositionCode"u8))
-                {
-                    dispositionCode = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobClosedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                assignmentId,
-                workerId,
-                dispositionCode);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobClosedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClosedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobClosedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobClosedEventData IPersistableModel<AcsRouterJobClosedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobClosedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobClosedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobClosedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobClosedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobClosedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobClosedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClosedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClosedEventData.cs
deleted file mode 100644
index 6fc530792e27..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobClosedEventData.cs
+++ /dev/null
@@ -1,56 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobClosed event. </summary>
-    public partial class AcsRouterJobClosedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClosedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/> or <paramref name="tags"/> is null. </exception>
-        internal AcsRouterJobClosedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClosedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="assignmentId"> Router Job Closed Assignment Id. </param>
-        /// <param name="workerId"> Router Job Closed Worker Id. </param>
-        /// <param name="dispositionCode"> Router Job Closed Disposition Code. </param>
-        internal AcsRouterJobClosedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, string assignmentId, string workerId, string dispositionCode) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            AssignmentId = assignmentId;
-            WorkerId = workerId;
-            DispositionCode = dispositionCode;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobClosedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobClosedEventData()
-        {
-        }
-
-        /// <summary> Router Job Closed Assignment Id. </summary>
-        public string AssignmentId { get; }
-        /// <summary> Router Job Closed Worker Id. </summary>
-        public string WorkerId { get; }
-        /// <summary> Router Job Closed Disposition Code. </summary>
-        public string DispositionCode { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCompletedEventData.Serialization.cs
deleted file mode 100644
index ad9d4e2b7562..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobCompletedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(AssignmentId))
-            {
-                writer.WritePropertyName("assignmentId"u8);
-                writer.WriteStringValue(AssignmentId);
-            }
-            if (Optional.IsDefined(WorkerId))
-            {
-                writer.WritePropertyName("workerId"u8);
-                writer.WriteStringValue(WorkerId);
-            }
-        }
-
-        AcsRouterJobCompletedEventData IJsonModel<AcsRouterJobCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobCompletedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobCompletedEventData DeserializeAcsRouterJobCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string assignmentId = default;
-            string workerId = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("assignmentId"u8))
-                {
-                    assignmentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobCompletedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                assignmentId,
-                workerId);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobCompletedEventData IPersistableModel<AcsRouterJobCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCompletedEventData.cs
deleted file mode 100644
index bcb67b8d7a6c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobCompletedEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobCompleted event. </summary>
-    public partial class AcsRouterJobCompletedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobCompletedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/> or <paramref name="tags"/> is null. </exception>
-        internal AcsRouterJobCompletedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobCompletedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="assignmentId"> Router Job Completed Assignment Id. </param>
-        /// <param name="workerId"> Router Job Completed Worker Id. </param>
-        internal AcsRouterJobCompletedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, string assignmentId, string workerId) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            AssignmentId = assignmentId;
-            WorkerId = workerId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobCompletedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobCompletedEventData()
-        {
-        }
-
-        /// <summary> Router Job Completed Assignment Id. </summary>
-        public string AssignmentId { get; }
-        /// <summary> Router Job Completed Worker Id. </summary>
-        public string WorkerId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobDeletedEventData.Serialization.cs
deleted file mode 100644
index bbaef5ff3234..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobDeletedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AcsRouterJobDeletedEventData IJsonModel<AcsRouterJobDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobDeletedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobDeletedEventData DeserializeAcsRouterJobDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobDeletedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobDeletedEventData IPersistableModel<AcsRouterJobDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobDeletedEventData.cs
deleted file mode 100644
index 126b1aea8474..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobDeletedEventData.cs
+++ /dev/null
@@ -1,43 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobDeleted event. </summary>
-    public partial class AcsRouterJobDeletedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobDeletedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/> or <paramref name="tags"/> is null. </exception>
-        internal AcsRouterJobDeletedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobDeletedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        internal AcsRouterJobDeletedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobDeletedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobDeletedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobEventData.Serialization.cs
deleted file mode 100644
index 87daa91a2b05..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobEventData.Serialization.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(QueueId))
-            {
-                writer.WritePropertyName("queueId"u8);
-                writer.WriteStringValue(QueueId);
-            }
-            writer.WritePropertyName("labels"u8);
-            writer.WriteStartObject();
-            foreach (var item in Labels)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("tags"u8);
-            writer.WriteStartObject();
-            foreach (var item in Tags)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-        }
-
-        AcsRouterJobEventData IJsonModel<AcsRouterJobEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobEventData DeserializeAcsRouterJobEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobEventData IPersistableModel<AcsRouterJobEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobEventData.cs
deleted file mode 100644
index 0d4b12a31a8b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobEventData.cs
+++ /dev/null
@@ -1,56 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all Router Job events. </summary>
-    public partial class AcsRouterJobEventData : AcsRouterEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/> or <paramref name="tags"/> is null. </exception>
-        internal AcsRouterJobEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-
-            Labels = labels;
-            Tags = tags;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        internal AcsRouterJobEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags) : base(jobId, channelReference, channelId, serializedAdditionalRawData)
-        {
-            QueueId = queueId;
-            Labels = labels;
-            Tags = tags;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobEventData"/> for deserialization. </summary>
-        internal AcsRouterJobEventData()
-        {
-        }
-
-        /// <summary> Router Job events Queue Id. </summary>
-        public string QueueId { get; }
-        /// <summary> Router Job events Labels. </summary>
-        public IReadOnlyDictionary<string, string> Labels { get; }
-        /// <summary> Router Jobs events Tags. </summary>
-        public IReadOnlyDictionary<string, string> Tags { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobExceptionTriggeredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobExceptionTriggeredEventData.Serialization.cs
deleted file mode 100644
index d905440c958c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobExceptionTriggeredEventData.Serialization.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobExceptionTriggeredEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobExceptionTriggeredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobExceptionTriggeredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobExceptionTriggeredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobExceptionTriggeredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobExceptionTriggeredEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(RuleKey))
-            {
-                writer.WritePropertyName("ruleKey"u8);
-                writer.WriteStringValue(RuleKey);
-            }
-            if (Optional.IsDefined(ExceptionRuleId))
-            {
-                writer.WritePropertyName("exceptionRuleId"u8);
-                writer.WriteStringValue(ExceptionRuleId);
-            }
-        }
-
-        AcsRouterJobExceptionTriggeredEventData IJsonModel<AcsRouterJobExceptionTriggeredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobExceptionTriggeredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobExceptionTriggeredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobExceptionTriggeredEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobExceptionTriggeredEventData DeserializeAcsRouterJobExceptionTriggeredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string ruleKey = default;
-            string exceptionRuleId = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("ruleKey"u8))
-                {
-                    ruleKey = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("exceptionRuleId"u8))
-                {
-                    exceptionRuleId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobExceptionTriggeredEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                ruleKey,
-                exceptionRuleId);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobExceptionTriggeredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobExceptionTriggeredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobExceptionTriggeredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobExceptionTriggeredEventData IPersistableModel<AcsRouterJobExceptionTriggeredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobExceptionTriggeredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobExceptionTriggeredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobExceptionTriggeredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobExceptionTriggeredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobExceptionTriggeredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobExceptionTriggeredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobExceptionTriggeredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobExceptionTriggeredEventData.cs
deleted file mode 100644
index 9f4aa2bed164..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobExceptionTriggeredEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobExceptionTriggered event. </summary>
-    public partial class AcsRouterJobExceptionTriggeredEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobExceptionTriggeredEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/> or <paramref name="tags"/> is null. </exception>
-        internal AcsRouterJobExceptionTriggeredEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobExceptionTriggeredEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="ruleKey"> Router Job Exception Triggered Rule Key. </param>
-        /// <param name="exceptionRuleId"> Router Job Exception Triggered Rule Id. </param>
-        internal AcsRouterJobExceptionTriggeredEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, string ruleKey, string exceptionRuleId) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            RuleKey = ruleKey;
-            ExceptionRuleId = exceptionRuleId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobExceptionTriggeredEventData"/> for deserialization. </summary>
-        internal AcsRouterJobExceptionTriggeredEventData()
-        {
-        }
-
-        /// <summary> Router Job Exception Triggered Rule Key. </summary>
-        public string RuleKey { get; }
-        /// <summary> Router Job Exception Triggered Rule Id. </summary>
-        public string ExceptionRuleId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobQueuedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobQueuedEventData.Serialization.cs
deleted file mode 100644
index 75226e90cba1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobQueuedEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobQueuedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobQueuedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobQueuedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobQueuedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobQueuedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(Priority))
-            {
-                writer.WritePropertyName("priority"u8);
-                writer.WriteNumberValue(Priority.Value);
-            }
-            writer.WritePropertyName("attachedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in AttachedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("requestedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in RequestedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        AcsRouterJobQueuedEventData IJsonModel<AcsRouterJobQueuedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobQueuedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobQueuedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobQueuedEventData DeserializeAcsRouterJobQueuedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            int? priority = default;
-            IReadOnlyList<AcsRouterWorkerSelector> attachedWorkerSelectors = default;
-            IReadOnlyList<AcsRouterWorkerSelector> requestedWorkerSelectors = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("priority"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    priority = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("attachedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    attachedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("requestedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    requestedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobQueuedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                priority,
-                attachedWorkerSelectors,
-                requestedWorkerSelectors);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobQueuedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobQueuedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobQueuedEventData IPersistableModel<AcsRouterJobQueuedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobQueuedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobQueuedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobQueuedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobQueuedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobQueuedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobQueuedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobQueuedEventData.cs
deleted file mode 100644
index ac701da4ca38..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobQueuedEventData.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobQueued event. </summary>
-    public partial class AcsRouterJobQueuedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobQueuedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="attachedWorkerSelectors"> Router Job Queued Attached Worker Selector. </param>
-        /// <param name="requestedWorkerSelectors"> Router Job Queued Requested Worker Selector. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/>, <paramref name="tags"/>, <paramref name="attachedWorkerSelectors"/> or <paramref name="requestedWorkerSelectors"/> is null. </exception>
-        internal AcsRouterJobQueuedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IEnumerable<AcsRouterWorkerSelector> attachedWorkerSelectors, IEnumerable<AcsRouterWorkerSelector> requestedWorkerSelectors) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(attachedWorkerSelectors, nameof(attachedWorkerSelectors));
-            Argument.AssertNotNull(requestedWorkerSelectors, nameof(requestedWorkerSelectors));
-
-            AttachedWorkerSelectors = attachedWorkerSelectors.ToList();
-            RequestedWorkerSelectors = requestedWorkerSelectors.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobQueuedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="priority"> Router Job Priority. </param>
-        /// <param name="attachedWorkerSelectors"> Router Job Queued Attached Worker Selector. </param>
-        /// <param name="requestedWorkerSelectors"> Router Job Queued Requested Worker Selector. </param>
-        internal AcsRouterJobQueuedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, int? priority, IReadOnlyList<AcsRouterWorkerSelector> attachedWorkerSelectors, IReadOnlyList<AcsRouterWorkerSelector> requestedWorkerSelectors) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            Priority = priority;
-            AttachedWorkerSelectors = attachedWorkerSelectors;
-            RequestedWorkerSelectors = requestedWorkerSelectors;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobQueuedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobQueuedEventData()
-        {
-        }
-
-        /// <summary> Router Job Priority. </summary>
-        public int? Priority { get; }
-        /// <summary> Router Job Queued Attached Worker Selector. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> AttachedWorkerSelectors { get; }
-        /// <summary> Router Job Queued Requested Worker Selector. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> RequestedWorkerSelectors { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobReceivedEventData.Serialization.cs
deleted file mode 100644
index 0e2b60e8c2da..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobReceivedEventData.Serialization.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobReceivedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobReceivedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobReceivedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobReceivedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobReceivedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("jobStatus"u8);
-            writer.WriteStringValue(JobStatus.ToString());
-            if (Optional.IsDefined(ClassificationPolicyId))
-            {
-                writer.WritePropertyName("classificationPolicyId"u8);
-                writer.WriteStringValue(ClassificationPolicyId);
-            }
-            if (Optional.IsDefined(Priority))
-            {
-                writer.WritePropertyName("priority"u8);
-                writer.WriteNumberValue(Priority.Value);
-            }
-            writer.WritePropertyName("requestedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in RequestedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("scheduledOn"u8);
-            writer.WriteStringValue(ScheduledOn, "O");
-            writer.WritePropertyName("unavailableForMatching"u8);
-            writer.WriteBooleanValue(UnavailableForMatching);
-        }
-
-        AcsRouterJobReceivedEventData IJsonModel<AcsRouterJobReceivedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobReceivedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobReceivedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobReceivedEventData DeserializeAcsRouterJobReceivedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AcsRouterJobStatus jobStatus = default;
-            string classificationPolicyId = default;
-            int? priority = default;
-            IReadOnlyList<AcsRouterWorkerSelector> requestedWorkerSelectors = default;
-            DateTimeOffset scheduledOn = default;
-            bool unavailableForMatching = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("jobStatus"u8))
-                {
-                    jobStatus = new AcsRouterJobStatus(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("classificationPolicyId"u8))
-                {
-                    classificationPolicyId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("priority"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    priority = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("requestedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    requestedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("scheduledOn"u8))
-                {
-                    scheduledOn = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("unavailableForMatching"u8))
-                {
-                    unavailableForMatching = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobReceivedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                jobStatus,
-                classificationPolicyId,
-                priority,
-                requestedWorkerSelectors,
-                scheduledOn,
-                unavailableForMatching);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobReceivedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobReceivedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobReceivedEventData IPersistableModel<AcsRouterJobReceivedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobReceivedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobReceivedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobReceivedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobReceivedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobReceivedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobReceivedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobReceivedEventData.cs
deleted file mode 100644
index 3a5d5a136ea7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobReceivedEventData.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobReceived event. </summary>
-    public partial class AcsRouterJobReceivedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobReceivedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="jobStatus"> Router Job Received Job Status. </param>
-        /// <param name="requestedWorkerSelectors"> Router Job Received Requested Worker Selectors. </param>
-        /// <param name="scheduledOn"> Router Job Received Scheduled Time in UTC. </param>
-        /// <param name="unavailableForMatching"> Unavailable For Matching for Router Job Received. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/>, <paramref name="tags"/> or <paramref name="requestedWorkerSelectors"/> is null. </exception>
-        internal AcsRouterJobReceivedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, AcsRouterJobStatus jobStatus, IEnumerable<AcsRouterWorkerSelector> requestedWorkerSelectors, DateTimeOffset scheduledOn, bool unavailableForMatching) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(requestedWorkerSelectors, nameof(requestedWorkerSelectors));
-
-            JobStatus = jobStatus;
-            RequestedWorkerSelectors = requestedWorkerSelectors.ToList();
-            ScheduledOn = scheduledOn;
-            UnavailableForMatching = unavailableForMatching;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobReceivedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="jobStatus"> Router Job Received Job Status. </param>
-        /// <param name="classificationPolicyId"> Router Job Classification Policy Id. </param>
-        /// <param name="priority"> Router Job Priority. </param>
-        /// <param name="requestedWorkerSelectors"> Router Job Received Requested Worker Selectors. </param>
-        /// <param name="scheduledOn"> Router Job Received Scheduled Time in UTC. </param>
-        /// <param name="unavailableForMatching"> Unavailable For Matching for Router Job Received. </param>
-        internal AcsRouterJobReceivedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, AcsRouterJobStatus jobStatus, string classificationPolicyId, int? priority, IReadOnlyList<AcsRouterWorkerSelector> requestedWorkerSelectors, DateTimeOffset scheduledOn, bool unavailableForMatching) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            JobStatus = jobStatus;
-            ClassificationPolicyId = classificationPolicyId;
-            Priority = priority;
-            RequestedWorkerSelectors = requestedWorkerSelectors;
-            ScheduledOn = scheduledOn;
-            UnavailableForMatching = unavailableForMatching;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobReceivedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobReceivedEventData()
-        {
-        }
-
-        /// <summary> Router Job Received Job Status. </summary>
-        public AcsRouterJobStatus JobStatus { get; }
-        /// <summary> Router Job Classification Policy Id. </summary>
-        public string ClassificationPolicyId { get; }
-        /// <summary> Router Job Priority. </summary>
-        public int? Priority { get; }
-        /// <summary> Router Job Received Requested Worker Selectors. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> RequestedWorkerSelectors { get; }
-        /// <summary> Router Job Received Scheduled Time in UTC. </summary>
-        public DateTimeOffset ScheduledOn { get; }
-        /// <summary> Unavailable For Matching for Router Job Received. </summary>
-        public bool UnavailableForMatching { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobSchedulingFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobSchedulingFailedEventData.Serialization.cs
deleted file mode 100644
index 69d6854197d6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobSchedulingFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobSchedulingFailedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobSchedulingFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobSchedulingFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobSchedulingFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobSchedulingFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobSchedulingFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(Priority))
-            {
-                writer.WritePropertyName("priority"u8);
-                writer.WriteNumberValue(Priority.Value);
-            }
-            writer.WritePropertyName("expiredAttachedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in ExpiredAttachedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("expiredRequestedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in ExpiredRequestedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("scheduledOn"u8);
-            writer.WriteStringValue(ScheduledOn, "O");
-            if (Optional.IsDefined(FailureReason))
-            {
-                writer.WritePropertyName("failureReason"u8);
-                writer.WriteStringValue(FailureReason);
-            }
-        }
-
-        AcsRouterJobSchedulingFailedEventData IJsonModel<AcsRouterJobSchedulingFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobSchedulingFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobSchedulingFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobSchedulingFailedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobSchedulingFailedEventData DeserializeAcsRouterJobSchedulingFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            int? priority = default;
-            IReadOnlyList<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors = default;
-            IReadOnlyList<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors = default;
-            DateTimeOffset scheduledOn = default;
-            string failureReason = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("priority"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    priority = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("expiredAttachedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    expiredAttachedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("expiredRequestedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    expiredRequestedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("scheduledOn"u8))
-                {
-                    scheduledOn = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("failureReason"u8))
-                {
-                    failureReason = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobSchedulingFailedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                priority,
-                expiredAttachedWorkerSelectors,
-                expiredRequestedWorkerSelectors,
-                scheduledOn,
-                failureReason);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobSchedulingFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobSchedulingFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobSchedulingFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobSchedulingFailedEventData IPersistableModel<AcsRouterJobSchedulingFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobSchedulingFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobSchedulingFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobSchedulingFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobSchedulingFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobSchedulingFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobSchedulingFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobSchedulingFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobSchedulingFailedEventData.cs
deleted file mode 100644
index 6d55b80f185a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobSchedulingFailedEventData.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobSchedulingFailed event. </summary>
-    public partial class AcsRouterJobSchedulingFailedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobSchedulingFailedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Scheduling Failed Attached Worker Selector Expired. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Scheduling Failed Requested Worker Selector Expired. </param>
-        /// <param name="scheduledOn"> Router Job Scheduling Failed Scheduled Time in UTC. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/>, <paramref name="tags"/>, <paramref name="expiredAttachedWorkerSelectors"/> or <paramref name="expiredRequestedWorkerSelectors"/> is null. </exception>
-        internal AcsRouterJobSchedulingFailedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IEnumerable<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors, IEnumerable<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors, DateTimeOffset scheduledOn) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(expiredAttachedWorkerSelectors, nameof(expiredAttachedWorkerSelectors));
-            Argument.AssertNotNull(expiredRequestedWorkerSelectors, nameof(expiredRequestedWorkerSelectors));
-
-            ExpiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors.ToList();
-            ExpiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors.ToList();
-            ScheduledOn = scheduledOn;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobSchedulingFailedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="priority"> Router Job Priority. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Scheduling Failed Attached Worker Selector Expired. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Scheduling Failed Requested Worker Selector Expired. </param>
-        /// <param name="scheduledOn"> Router Job Scheduling Failed Scheduled Time in UTC. </param>
-        /// <param name="failureReason"> Router Job Scheduling Failed Reason. </param>
-        internal AcsRouterJobSchedulingFailedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, int? priority, IReadOnlyList<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors, IReadOnlyList<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors, DateTimeOffset scheduledOn, string failureReason) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            Priority = priority;
-            ExpiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors;
-            ExpiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors;
-            ScheduledOn = scheduledOn;
-            FailureReason = failureReason;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobSchedulingFailedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobSchedulingFailedEventData()
-        {
-        }
-
-        /// <summary> Router Job Priority. </summary>
-        public int? Priority { get; }
-        /// <summary> Router Job Scheduling Failed Attached Worker Selector Expired. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> ExpiredAttachedWorkerSelectors { get; }
-        /// <summary> Router Job Scheduling Failed Requested Worker Selector Expired. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> ExpiredRequestedWorkerSelectors { get; }
-        /// <summary> Router Job Scheduling Failed Scheduled Time in UTC. </summary>
-        public DateTimeOffset ScheduledOn { get; }
-        /// <summary> Router Job Scheduling Failed Reason. </summary>
-        public string FailureReason { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobStatus.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobStatus.cs
deleted file mode 100644
index f678137c38b7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobStatus.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Acs Router Job Status. </summary>
-    public readonly partial struct AcsRouterJobStatus : IEquatable<AcsRouterJobStatus>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobStatus"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsRouterJobStatus(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string PendingClassificationValue = "PendingClassification";
-        private const string QueuedValue = "Queued";
-        private const string AssignedValue = "Assigned";
-        private const string CompletedValue = "Completed";
-        private const string ClosedValue = "Closed";
-        private const string CancelledValue = "Cancelled";
-        private const string ClassificationFailedValue = "ClassificationFailed";
-        private const string CreatedValue = "Created";
-        private const string PendingScheduleValue = "PendingSchedule";
-        private const string ScheduledValue = "Scheduled";
-        private const string ScheduleFailedValue = "ScheduleFailed";
-        private const string WaitingForActivationValue = "WaitingForActivation";
-
-        /// <summary> Router Job Status Pending Classification. </summary>
-        public static AcsRouterJobStatus PendingClassification { get; } = new AcsRouterJobStatus(PendingClassificationValue);
-        /// <summary> Router Job Status Queued. </summary>
-        public static AcsRouterJobStatus Queued { get; } = new AcsRouterJobStatus(QueuedValue);
-        /// <summary> Router Job Status Assigned. </summary>
-        public static AcsRouterJobStatus Assigned { get; } = new AcsRouterJobStatus(AssignedValue);
-        /// <summary> Router Job Status Completed. </summary>
-        public static AcsRouterJobStatus Completed { get; } = new AcsRouterJobStatus(CompletedValue);
-        /// <summary> Router Job Status Closed. </summary>
-        public static AcsRouterJobStatus Closed { get; } = new AcsRouterJobStatus(ClosedValue);
-        /// <summary> Router Job Status Cancelled. </summary>
-        public static AcsRouterJobStatus Cancelled { get; } = new AcsRouterJobStatus(CancelledValue);
-        /// <summary> Router Job Status Classification Failed. </summary>
-        public static AcsRouterJobStatus ClassificationFailed { get; } = new AcsRouterJobStatus(ClassificationFailedValue);
-        /// <summary> Router Job Status Created. </summary>
-        public static AcsRouterJobStatus Created { get; } = new AcsRouterJobStatus(CreatedValue);
-        /// <summary> Router Job Status Pending Schedule. </summary>
-        public static AcsRouterJobStatus PendingSchedule { get; } = new AcsRouterJobStatus(PendingScheduleValue);
-        /// <summary> Router Job Status Scheduled. </summary>
-        public static AcsRouterJobStatus Scheduled { get; } = new AcsRouterJobStatus(ScheduledValue);
-        /// <summary> Router Job Status Schedule Failed. </summary>
-        public static AcsRouterJobStatus ScheduleFailed { get; } = new AcsRouterJobStatus(ScheduleFailedValue);
-        /// <summary> Router Job Status Waiting For Activation. </summary>
-        public static AcsRouterJobStatus WaitingForActivation { get; } = new AcsRouterJobStatus(WaitingForActivationValue);
-        /// <summary> Determines if two <see cref="AcsRouterJobStatus"/> values are the same. </summary>
-        public static bool operator ==(AcsRouterJobStatus left, AcsRouterJobStatus right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsRouterJobStatus"/> values are not the same. </summary>
-        public static bool operator !=(AcsRouterJobStatus left, AcsRouterJobStatus right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsRouterJobStatus"/>. </summary>
-        public static implicit operator AcsRouterJobStatus(string value) => new AcsRouterJobStatus(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsRouterJobStatus other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsRouterJobStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobUnassignedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobUnassignedEventData.Serialization.cs
deleted file mode 100644
index 9441b48fa3fb..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobUnassignedEventData.Serialization.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobUnassignedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobUnassignedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobUnassignedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobUnassignedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobUnassignedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobUnassignedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(AssignmentId))
-            {
-                writer.WritePropertyName("assignmentId"u8);
-                writer.WriteStringValue(AssignmentId);
-            }
-            if (Optional.IsDefined(WorkerId))
-            {
-                writer.WritePropertyName("workerId"u8);
-                writer.WriteStringValue(WorkerId);
-            }
-        }
-
-        AcsRouterJobUnassignedEventData IJsonModel<AcsRouterJobUnassignedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobUnassignedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobUnassignedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobUnassignedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobUnassignedEventData DeserializeAcsRouterJobUnassignedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string assignmentId = default;
-            string workerId = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("assignmentId"u8))
-                {
-                    assignmentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobUnassignedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                assignmentId,
-                workerId);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobUnassignedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobUnassignedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobUnassignedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobUnassignedEventData IPersistableModel<AcsRouterJobUnassignedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobUnassignedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobUnassignedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobUnassignedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobUnassignedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobUnassignedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobUnassignedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobUnassignedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobUnassignedEventData.cs
deleted file mode 100644
index 21e9655d2741..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobUnassignedEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobUnassigned event. </summary>
-    public partial class AcsRouterJobUnassignedEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobUnassignedEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/> or <paramref name="tags"/> is null. </exception>
-        internal AcsRouterJobUnassignedEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobUnassignedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="assignmentId"> Router Job Unassigned Assignment Id. </param>
-        /// <param name="workerId"> Router Job Unassigned Worker Id. </param>
-        internal AcsRouterJobUnassignedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, string assignmentId, string workerId) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            AssignmentId = assignmentId;
-            WorkerId = workerId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobUnassignedEventData"/> for deserialization. </summary>
-        internal AcsRouterJobUnassignedEventData()
-        {
-        }
-
-        /// <summary> Router Job Unassigned Assignment Id. </summary>
-        public string AssignmentId { get; }
-        /// <summary> Router Job Unassigned Worker Id. </summary>
-        public string WorkerId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWaitingForActivationEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWaitingForActivationEventData.Serialization.cs
deleted file mode 100644
index fc5948af2cc9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWaitingForActivationEventData.Serialization.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobWaitingForActivationEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobWaitingForActivationEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobWaitingForActivationEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobWaitingForActivationEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobWaitingForActivationEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobWaitingForActivationEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(Priority))
-            {
-                writer.WritePropertyName("priority"u8);
-                writer.WriteNumberValue(Priority.Value);
-            }
-            writer.WritePropertyName("expiredAttachedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in ExpiredAttachedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("expiredRequestedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in ExpiredRequestedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("scheduledOn"u8);
-            writer.WriteStringValue(ScheduledOn, "O");
-            writer.WritePropertyName("unavailableForMatching"u8);
-            writer.WriteBooleanValue(UnavailableForMatching);
-        }
-
-        AcsRouterJobWaitingForActivationEventData IJsonModel<AcsRouterJobWaitingForActivationEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobWaitingForActivationEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobWaitingForActivationEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobWaitingForActivationEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobWaitingForActivationEventData DeserializeAcsRouterJobWaitingForActivationEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            int? priority = default;
-            IReadOnlyList<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors = default;
-            IReadOnlyList<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors = default;
-            DateTimeOffset scheduledOn = default;
-            bool unavailableForMatching = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("priority"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    priority = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("expiredAttachedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    expiredAttachedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("expiredRequestedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    expiredRequestedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("scheduledOn"u8))
-                {
-                    scheduledOn = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("unavailableForMatching"u8))
-                {
-                    unavailableForMatching = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobWaitingForActivationEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                priority,
-                expiredAttachedWorkerSelectors,
-                expiredRequestedWorkerSelectors,
-                scheduledOn,
-                unavailableForMatching);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobWaitingForActivationEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobWaitingForActivationEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobWaitingForActivationEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobWaitingForActivationEventData IPersistableModel<AcsRouterJobWaitingForActivationEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobWaitingForActivationEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobWaitingForActivationEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobWaitingForActivationEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobWaitingForActivationEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobWaitingForActivationEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobWaitingForActivationEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWaitingForActivationEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWaitingForActivationEventData.cs
deleted file mode 100644
index 445da526d6c0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWaitingForActivationEventData.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobWaitingForActivation event. </summary>
-    public partial class AcsRouterJobWaitingForActivationEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobWaitingForActivationEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Waiting For Activation Worker Selector Expired. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Waiting For Activation Requested Worker Selector Expired. </param>
-        /// <param name="scheduledOn"> Router Job Waiting For Activation Scheduled Time in UTC. </param>
-        /// <param name="unavailableForMatching"> Router Job Waiting For Activation Unavailable For Matching. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/>, <paramref name="tags"/>, <paramref name="expiredAttachedWorkerSelectors"/> or <paramref name="expiredRequestedWorkerSelectors"/> is null. </exception>
-        internal AcsRouterJobWaitingForActivationEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IEnumerable<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors, IEnumerable<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors, DateTimeOffset scheduledOn, bool unavailableForMatching) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(expiredAttachedWorkerSelectors, nameof(expiredAttachedWorkerSelectors));
-            Argument.AssertNotNull(expiredRequestedWorkerSelectors, nameof(expiredRequestedWorkerSelectors));
-
-            ExpiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors.ToList();
-            ExpiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors.ToList();
-            ScheduledOn = scheduledOn;
-            UnavailableForMatching = unavailableForMatching;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobWaitingForActivationEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="priority"> Router Job Waiting For Activation Priority. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Waiting For Activation Worker Selector Expired. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Waiting For Activation Requested Worker Selector Expired. </param>
-        /// <param name="scheduledOn"> Router Job Waiting For Activation Scheduled Time in UTC. </param>
-        /// <param name="unavailableForMatching"> Router Job Waiting For Activation Unavailable For Matching. </param>
-        internal AcsRouterJobWaitingForActivationEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, int? priority, IReadOnlyList<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors, IReadOnlyList<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors, DateTimeOffset scheduledOn, bool unavailableForMatching) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            Priority = priority;
-            ExpiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors;
-            ExpiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors;
-            ScheduledOn = scheduledOn;
-            UnavailableForMatching = unavailableForMatching;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobWaitingForActivationEventData"/> for deserialization. </summary>
-        internal AcsRouterJobWaitingForActivationEventData()
-        {
-        }
-
-        /// <summary> Router Job Waiting For Activation Priority. </summary>
-        public int? Priority { get; }
-        /// <summary> Router Job Waiting For Activation Worker Selector Expired. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> ExpiredAttachedWorkerSelectors { get; }
-        /// <summary> Router Job Waiting For Activation Requested Worker Selector Expired. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> ExpiredRequestedWorkerSelectors { get; }
-        /// <summary> Router Job Waiting For Activation Scheduled Time in UTC. </summary>
-        public DateTimeOffset ScheduledOn { get; }
-        /// <summary> Router Job Waiting For Activation Unavailable For Matching. </summary>
-        public bool UnavailableForMatching { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWorkerSelectorsExpiredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWorkerSelectorsExpiredEventData.Serialization.cs
deleted file mode 100644
index c413c842d5f3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWorkerSelectorsExpiredEventData.Serialization.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterJobWorkerSelectorsExpiredEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterJobWorkerSelectorsExpiredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterJobWorkerSelectorsExpiredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterJobWorkerSelectorsExpiredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobWorkerSelectorsExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobWorkerSelectorsExpiredEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("expiredRequestedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in ExpiredRequestedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("expiredAttachedWorkerSelectors"u8);
-            writer.WriteStartArray();
-            foreach (var item in ExpiredAttachedWorkerSelectors)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        AcsRouterJobWorkerSelectorsExpiredEventData IJsonModel<AcsRouterJobWorkerSelectorsExpiredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobWorkerSelectorsExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterJobWorkerSelectorsExpiredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterJobWorkerSelectorsExpiredEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterJobWorkerSelectorsExpiredEventData DeserializeAcsRouterJobWorkerSelectorsExpiredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors = default;
-            IReadOnlyList<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors = default;
-            string queueId = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("expiredRequestedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    expiredRequestedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("expiredAttachedWorkerSelectors"u8))
-                {
-                    List<AcsRouterWorkerSelector> array = new List<AcsRouterWorkerSelector>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterWorkerSelector.DeserializeAcsRouterWorkerSelector(item, options));
-                    }
-                    expiredAttachedWorkerSelectors = array;
-                    continue;
-                }
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterJobWorkerSelectorsExpiredEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                queueId,
-                labels,
-                tags,
-                expiredRequestedWorkerSelectors,
-                expiredAttachedWorkerSelectors);
-        }
-
-        BinaryData IPersistableModel<AcsRouterJobWorkerSelectorsExpiredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobWorkerSelectorsExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobWorkerSelectorsExpiredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterJobWorkerSelectorsExpiredEventData IPersistableModel<AcsRouterJobWorkerSelectorsExpiredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterJobWorkerSelectorsExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterJobWorkerSelectorsExpiredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterJobWorkerSelectorsExpiredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterJobWorkerSelectorsExpiredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterJobWorkerSelectorsExpiredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterJobWorkerSelectorsExpiredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWorkerSelectorsExpiredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWorkerSelectorsExpiredEventData.cs
deleted file mode 100644
index 28655f6d0119..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterJobWorkerSelectorsExpiredEventData.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterJobWorkerSelectorsExpired event. </summary>
-    public partial class AcsRouterJobWorkerSelectorsExpiredEventData : AcsRouterJobEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobWorkerSelectorsExpiredEventData"/>. </summary>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Worker Selectors Expired Requested Worker Selectors. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Worker Selectors Expired Attached Worker Selectors. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/>, <paramref name="tags"/>, <paramref name="expiredRequestedWorkerSelectors"/> or <paramref name="expiredAttachedWorkerSelectors"/> is null. </exception>
-        internal AcsRouterJobWorkerSelectorsExpiredEventData(IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IEnumerable<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors, IEnumerable<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors) : base(labels, tags)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(expiredRequestedWorkerSelectors, nameof(expiredRequestedWorkerSelectors));
-            Argument.AssertNotNull(expiredAttachedWorkerSelectors, nameof(expiredAttachedWorkerSelectors));
-
-            ExpiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors.ToList();
-            ExpiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobWorkerSelectorsExpiredEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Worker Selectors Expired Requested Worker Selectors. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Worker Selectors Expired Attached Worker Selectors. </param>
-        internal AcsRouterJobWorkerSelectorsExpiredEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string queueId, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IReadOnlyList<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors, IReadOnlyList<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors) : base(jobId, channelReference, channelId, serializedAdditionalRawData, queueId, labels, tags)
-        {
-            ExpiredRequestedWorkerSelectors = expiredRequestedWorkerSelectors;
-            ExpiredAttachedWorkerSelectors = expiredAttachedWorkerSelectors;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterJobWorkerSelectorsExpiredEventData"/> for deserialization. </summary>
-        internal AcsRouterJobWorkerSelectorsExpiredEventData()
-        {
-        }
-
-        /// <summary> Router Job Worker Selectors Expired Requested Worker Selectors. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> ExpiredRequestedWorkerSelectors { get; }
-        /// <summary> Router Job Worker Selectors Expired Attached Worker Selectors. </summary>
-        public IReadOnlyList<AcsRouterWorkerSelector> ExpiredAttachedWorkerSelectors { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterLabelOperator.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterLabelOperator.cs
deleted file mode 100644
index 6a90053bf7f6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterLabelOperator.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Router Job Worker Selector Label Operator. </summary>
-    public readonly partial struct AcsRouterLabelOperator : IEquatable<AcsRouterLabelOperator>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterLabelOperator"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsRouterLabelOperator(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string EqualValue = "Equal";
-        private const string NotEqualValue = "NotEqual";
-        private const string GreaterValue = "Greater";
-        private const string LessValue = "Less";
-        private const string GreaterThanOrEqualValue = "GreaterThanOrEqual";
-        private const string LessThanOrEqualValue = "LessThanOrEqual";
-
-        /// <summary> Router Label Operator Equal. </summary>
-        public static AcsRouterLabelOperator Equal { get; } = new AcsRouterLabelOperator(EqualValue);
-        /// <summary> Router Label Operator Not Equal. </summary>
-        public static AcsRouterLabelOperator NotEqual { get; } = new AcsRouterLabelOperator(NotEqualValue);
-        /// <summary> Router Label Operator Greater. </summary>
-        public static AcsRouterLabelOperator Greater { get; } = new AcsRouterLabelOperator(GreaterValue);
-        /// <summary> Router Label Operator Less. </summary>
-        public static AcsRouterLabelOperator Less { get; } = new AcsRouterLabelOperator(LessValue);
-        /// <summary> Router Label Operator Greater than or equal. </summary>
-        public static AcsRouterLabelOperator GreaterThanOrEqual { get; } = new AcsRouterLabelOperator(GreaterThanOrEqualValue);
-        /// <summary> Router Label Operator Less than or equal. </summary>
-        public static AcsRouterLabelOperator LessThanOrEqual { get; } = new AcsRouterLabelOperator(LessThanOrEqualValue);
-        /// <summary> Determines if two <see cref="AcsRouterLabelOperator"/> values are the same. </summary>
-        public static bool operator ==(AcsRouterLabelOperator left, AcsRouterLabelOperator right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsRouterLabelOperator"/> values are not the same. </summary>
-        public static bool operator !=(AcsRouterLabelOperator left, AcsRouterLabelOperator right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsRouterLabelOperator"/>. </summary>
-        public static implicit operator AcsRouterLabelOperator(string value) => new AcsRouterLabelOperator(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsRouterLabelOperator other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsRouterLabelOperator other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterQueueDetails.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterQueueDetails.Serialization.cs
deleted file mode 100644
index c25adb1efb16..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterQueueDetails.Serialization.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterQueueDetails : IUtf8JsonSerializable, IJsonModel<AcsRouterQueueDetails>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterQueueDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterQueueDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterQueueDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterQueueDetails)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            writer.WritePropertyName("labels"u8);
-            writer.WriteStartObject();
-            foreach (var item in Labels)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRouterQueueDetails IJsonModel<AcsRouterQueueDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterQueueDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterQueueDetails)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterQueueDetails(document.RootElement, options);
-        }
-
-        internal static AcsRouterQueueDetails DeserializeAcsRouterQueueDetails(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string name = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterQueueDetails(id, name, labels, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRouterQueueDetails>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterQueueDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterQueueDetails)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterQueueDetails IPersistableModel<AcsRouterQueueDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterQueueDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterQueueDetails(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterQueueDetails)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterQueueDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRouterQueueDetails FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterQueueDetails(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterQueueDetails.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterQueueDetails.cs
deleted file mode 100644
index c1c9142e9c3c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterQueueDetails.cs
+++ /dev/null
@@ -1,83 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Router Queue Details. </summary>
-    public partial class AcsRouterQueueDetails
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterQueueDetails"/>. </summary>
-        /// <param name="labels"> Router Queue Labels. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labels"/> is null. </exception>
-        internal AcsRouterQueueDetails(IReadOnlyDictionary<string, string> labels)
-        {
-            Argument.AssertNotNull(labels, nameof(labels));
-
-            Labels = labels;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterQueueDetails"/>. </summary>
-        /// <param name="id"> Router Queue Id. </param>
-        /// <param name="name"> Router Queue Name. </param>
-        /// <param name="labels"> Router Queue Labels. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRouterQueueDetails(string id, string name, IReadOnlyDictionary<string, string> labels, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            Name = name;
-            Labels = labels;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterQueueDetails"/> for deserialization. </summary>
-        internal AcsRouterQueueDetails()
-        {
-        }
-
-        /// <summary> Router Queue Id. </summary>
-        public string Id { get; }
-        /// <summary> Router Queue Name. </summary>
-        public string Name { get; }
-        /// <summary> Router Queue Labels. </summary>
-        public IReadOnlyDictionary<string, string> Labels { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterUpdatedWorkerProperty.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterUpdatedWorkerProperty.cs
deleted file mode 100644
index 670a1c711318..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterUpdatedWorkerProperty.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Worker properties that can be updated. </summary>
-    public readonly partial struct AcsRouterUpdatedWorkerProperty : IEquatable<AcsRouterUpdatedWorkerProperty>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterUpdatedWorkerProperty"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsRouterUpdatedWorkerProperty(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string AvailableForOffersValue = "AvailableForOffers";
-        private const string TotalCapacityValue = "TotalCapacity";
-        private const string QueueAssignmentsValue = "QueueAssignments";
-        private const string LabelsValue = "Labels";
-        private const string TagsValue = "Tags";
-        private const string ChannelConfigurationsValue = "ChannelConfigurations";
-
-        /// <summary> AvailableForOffers. </summary>
-        public static AcsRouterUpdatedWorkerProperty AvailableForOffers { get; } = new AcsRouterUpdatedWorkerProperty(AvailableForOffersValue);
-        /// <summary> TotalCapacity. </summary>
-        public static AcsRouterUpdatedWorkerProperty TotalCapacity { get; } = new AcsRouterUpdatedWorkerProperty(TotalCapacityValue);
-        /// <summary> QueueAssignments. </summary>
-        public static AcsRouterUpdatedWorkerProperty QueueAssignments { get; } = new AcsRouterUpdatedWorkerProperty(QueueAssignmentsValue);
-        /// <summary> Labels. </summary>
-        public static AcsRouterUpdatedWorkerProperty Labels { get; } = new AcsRouterUpdatedWorkerProperty(LabelsValue);
-        /// <summary> Tags. </summary>
-        public static AcsRouterUpdatedWorkerProperty Tags { get; } = new AcsRouterUpdatedWorkerProperty(TagsValue);
-        /// <summary> ChannelConfigurations. </summary>
-        public static AcsRouterUpdatedWorkerProperty ChannelConfigurations { get; } = new AcsRouterUpdatedWorkerProperty(ChannelConfigurationsValue);
-        /// <summary> Determines if two <see cref="AcsRouterUpdatedWorkerProperty"/> values are the same. </summary>
-        public static bool operator ==(AcsRouterUpdatedWorkerProperty left, AcsRouterUpdatedWorkerProperty right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsRouterUpdatedWorkerProperty"/> values are not the same. </summary>
-        public static bool operator !=(AcsRouterUpdatedWorkerProperty left, AcsRouterUpdatedWorkerProperty right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsRouterUpdatedWorkerProperty"/>. </summary>
-        public static implicit operator AcsRouterUpdatedWorkerProperty(string value) => new AcsRouterUpdatedWorkerProperty(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsRouterUpdatedWorkerProperty other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsRouterUpdatedWorkerProperty other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeletedEventData.Serialization.cs
deleted file mode 100644
index 7c89f2dfa373..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerDeletedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AcsRouterWorkerDeletedEventData IJsonModel<AcsRouterWorkerDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerDeletedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerDeletedEventData DeserializeAcsRouterWorkerDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string workerId = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerDeletedEventData(jobId, channelReference, channelId, serializedAdditionalRawData, workerId);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerDeletedEventData IPersistableModel<AcsRouterWorkerDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterWorkerDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeletedEventData.cs
deleted file mode 100644
index 038c0af0fb7d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeletedEventData.cs
+++ /dev/null
@@ -1,31 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerDeleted event. </summary>
-    public partial class AcsRouterWorkerDeletedEventData : AcsRouterWorkerEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerDeletedEventData"/>. </summary>
-        internal AcsRouterWorkerDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerDeletedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        internal AcsRouterWorkerDeletedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string workerId) : base(jobId, channelReference, channelId, serializedAdditionalRawData, workerId)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeregisteredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeregisteredEventData.Serialization.cs
deleted file mode 100644
index b248ed2ec1e4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeregisteredEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerDeregisteredEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerDeregisteredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerDeregisteredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerDeregisteredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerDeregisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerDeregisteredEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(WorkerId))
-            {
-                writer.WritePropertyName("workerId"u8);
-                writer.WriteStringValue(WorkerId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRouterWorkerDeregisteredEventData IJsonModel<AcsRouterWorkerDeregisteredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerDeregisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerDeregisteredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerDeregisteredEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerDeregisteredEventData DeserializeAcsRouterWorkerDeregisteredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string workerId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerDeregisteredEventData(workerId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerDeregisteredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerDeregisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerDeregisteredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerDeregisteredEventData IPersistableModel<AcsRouterWorkerDeregisteredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerDeregisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerDeregisteredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerDeregisteredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerDeregisteredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRouterWorkerDeregisteredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerDeregisteredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeregisteredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeregisteredEventData.cs
deleted file mode 100644
index bc11a21496ed..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerDeregisteredEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerDeregistered event. </summary>
-    public partial class AcsRouterWorkerDeregisteredEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerDeregisteredEventData"/>. </summary>
-        internal AcsRouterWorkerDeregisteredEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerDeregisteredEventData"/>. </summary>
-        /// <param name="workerId"> Router Worker Deregistered Worker Id. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRouterWorkerDeregisteredEventData(string workerId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            WorkerId = workerId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Router Worker Deregistered Worker Id. </summary>
-        public string WorkerId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerEventData.Serialization.cs
deleted file mode 100644
index 7c0739ea3ed8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerEventData.Serialization.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(WorkerId))
-            {
-                writer.WritePropertyName("workerId"u8);
-                writer.WriteStringValue(WorkerId);
-            }
-        }
-
-        AcsRouterWorkerEventData IJsonModel<AcsRouterWorkerEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerEventData DeserializeAcsRouterWorkerEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string workerId = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerEventData(jobId, channelReference, channelId, serializedAdditionalRawData, workerId);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerEventData IPersistableModel<AcsRouterWorkerEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterWorkerEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerEventData.cs
deleted file mode 100644
index 3a11277c3050..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerEventData.cs
+++ /dev/null
@@ -1,35 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all Router Worker events. </summary>
-    public partial class AcsRouterWorkerEventData : AcsRouterEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerEventData"/>. </summary>
-        internal AcsRouterWorkerEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        internal AcsRouterWorkerEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string workerId) : base(jobId, channelReference, channelId, serializedAdditionalRawData)
-        {
-            WorkerId = workerId;
-        }
-
-        /// <summary> Router Worker events Worker Id. </summary>
-        public string WorkerId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferAcceptedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferAcceptedEventData.Serialization.cs
deleted file mode 100644
index 3c17625dd6a3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferAcceptedEventData.Serialization.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerOfferAcceptedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerOfferAcceptedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerOfferAcceptedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerOfferAcceptedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferAcceptedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferAcceptedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(QueueId))
-            {
-                writer.WritePropertyName("queueId"u8);
-                writer.WriteStringValue(QueueId);
-            }
-            if (Optional.IsDefined(OfferId))
-            {
-                writer.WritePropertyName("offerId"u8);
-                writer.WriteStringValue(OfferId);
-            }
-            if (Optional.IsDefined(AssignmentId))
-            {
-                writer.WritePropertyName("assignmentId"u8);
-                writer.WriteStringValue(AssignmentId);
-            }
-            if (Optional.IsDefined(JobPriority))
-            {
-                writer.WritePropertyName("jobPriority"u8);
-                writer.WriteNumberValue(JobPriority.Value);
-            }
-            writer.WritePropertyName("workerLabels"u8);
-            writer.WriteStartObject();
-            foreach (var item in WorkerLabels)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("workerTags"u8);
-            writer.WriteStartObject();
-            foreach (var item in WorkerTags)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("jobLabels"u8);
-            writer.WriteStartObject();
-            foreach (var item in JobLabels)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("jobTags"u8);
-            writer.WriteStartObject();
-            foreach (var item in JobTags)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-        }
-
-        AcsRouterWorkerOfferAcceptedEventData IJsonModel<AcsRouterWorkerOfferAcceptedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferAcceptedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferAcceptedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerOfferAcceptedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerOfferAcceptedEventData DeserializeAcsRouterWorkerOfferAcceptedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string queueId = default;
-            string offerId = default;
-            string assignmentId = default;
-            int? jobPriority = default;
-            IReadOnlyDictionary<string, string> workerLabels = default;
-            IReadOnlyDictionary<string, string> workerTags = default;
-            IReadOnlyDictionary<string, string> jobLabels = default;
-            IReadOnlyDictionary<string, string> jobTags = default;
-            string workerId = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("offerId"u8))
-                {
-                    offerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("assignmentId"u8))
-                {
-                    assignmentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobPriority"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    jobPriority = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("workerLabels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    workerLabels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("workerTags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    workerTags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobLabels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobLabels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobTags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobTags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerOfferAcceptedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                workerId,
-                queueId,
-                offerId,
-                assignmentId,
-                jobPriority,
-                workerLabels,
-                workerTags,
-                jobLabels,
-                jobTags);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerOfferAcceptedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferAcceptedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferAcceptedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerOfferAcceptedEventData IPersistableModel<AcsRouterWorkerOfferAcceptedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferAcceptedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerOfferAcceptedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferAcceptedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerOfferAcceptedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterWorkerOfferAcceptedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerOfferAcceptedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferAcceptedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferAcceptedEventData.cs
deleted file mode 100644
index 8308b2379894..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferAcceptedEventData.cs
+++ /dev/null
@@ -1,83 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerOfferAccepted event. </summary>
-    public partial class AcsRouterWorkerOfferAcceptedEventData : AcsRouterWorkerEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferAcceptedEventData"/>. </summary>
-        /// <param name="workerLabels"> Router Worker Offer Accepted Worker Labels. </param>
-        /// <param name="workerTags"> Router Worker Offer Accepted Worker Tags. </param>
-        /// <param name="jobLabels"> Router Worker Offer Accepted Job Labels. </param>
-        /// <param name="jobTags"> Router Worker Offer Accepted Job Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="workerLabels"/>, <paramref name="workerTags"/>, <paramref name="jobLabels"/> or <paramref name="jobTags"/> is null. </exception>
-        internal AcsRouterWorkerOfferAcceptedEventData(IReadOnlyDictionary<string, string> workerLabels, IReadOnlyDictionary<string, string> workerTags, IReadOnlyDictionary<string, string> jobLabels, IReadOnlyDictionary<string, string> jobTags)
-        {
-            Argument.AssertNotNull(workerLabels, nameof(workerLabels));
-            Argument.AssertNotNull(workerTags, nameof(workerTags));
-            Argument.AssertNotNull(jobLabels, nameof(jobLabels));
-            Argument.AssertNotNull(jobTags, nameof(jobTags));
-
-            WorkerLabels = workerLabels;
-            WorkerTags = workerTags;
-            JobLabels = jobLabels;
-            JobTags = jobTags;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferAcceptedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Accepted Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Accepted Offer Id. </param>
-        /// <param name="assignmentId"> Router Worker Offer Accepted Assignment Id. </param>
-        /// <param name="jobPriority"> Router Worker Offer Accepted Job Priority. </param>
-        /// <param name="workerLabels"> Router Worker Offer Accepted Worker Labels. </param>
-        /// <param name="workerTags"> Router Worker Offer Accepted Worker Tags. </param>
-        /// <param name="jobLabels"> Router Worker Offer Accepted Job Labels. </param>
-        /// <param name="jobTags"> Router Worker Offer Accepted Job Tags. </param>
-        internal AcsRouterWorkerOfferAcceptedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string workerId, string queueId, string offerId, string assignmentId, int? jobPriority, IReadOnlyDictionary<string, string> workerLabels, IReadOnlyDictionary<string, string> workerTags, IReadOnlyDictionary<string, string> jobLabels, IReadOnlyDictionary<string, string> jobTags) : base(jobId, channelReference, channelId, serializedAdditionalRawData, workerId)
-        {
-            QueueId = queueId;
-            OfferId = offerId;
-            AssignmentId = assignmentId;
-            JobPriority = jobPriority;
-            WorkerLabels = workerLabels;
-            WorkerTags = workerTags;
-            JobLabels = jobLabels;
-            JobTags = jobTags;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferAcceptedEventData"/> for deserialization. </summary>
-        internal AcsRouterWorkerOfferAcceptedEventData()
-        {
-        }
-
-        /// <summary> Router Worker Offer Accepted Queue Id. </summary>
-        public string QueueId { get; }
-        /// <summary> Router Worker Offer Accepted Offer Id. </summary>
-        public string OfferId { get; }
-        /// <summary> Router Worker Offer Accepted Assignment Id. </summary>
-        public string AssignmentId { get; }
-        /// <summary> Router Worker Offer Accepted Job Priority. </summary>
-        public int? JobPriority { get; }
-        /// <summary> Router Worker Offer Accepted Worker Labels. </summary>
-        public IReadOnlyDictionary<string, string> WorkerLabels { get; }
-        /// <summary> Router Worker Offer Accepted Worker Tags. </summary>
-        public IReadOnlyDictionary<string, string> WorkerTags { get; }
-        /// <summary> Router Worker Offer Accepted Job Labels. </summary>
-        public IReadOnlyDictionary<string, string> JobLabels { get; }
-        /// <summary> Router Worker Offer Accepted Job Tags. </summary>
-        public IReadOnlyDictionary<string, string> JobTags { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferDeclinedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferDeclinedEventData.Serialization.cs
deleted file mode 100644
index 03ac1ee19352..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferDeclinedEventData.Serialization.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerOfferDeclinedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerOfferDeclinedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerOfferDeclinedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerOfferDeclinedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferDeclinedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferDeclinedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(QueueId))
-            {
-                writer.WritePropertyName("queueId"u8);
-                writer.WriteStringValue(QueueId);
-            }
-            if (Optional.IsDefined(OfferId))
-            {
-                writer.WritePropertyName("offerId"u8);
-                writer.WriteStringValue(OfferId);
-            }
-        }
-
-        AcsRouterWorkerOfferDeclinedEventData IJsonModel<AcsRouterWorkerOfferDeclinedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferDeclinedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferDeclinedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerOfferDeclinedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerOfferDeclinedEventData DeserializeAcsRouterWorkerOfferDeclinedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string queueId = default;
-            string offerId = default;
-            string workerId = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("offerId"u8))
-                {
-                    offerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerOfferDeclinedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                workerId,
-                queueId,
-                offerId);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerOfferDeclinedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferDeclinedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferDeclinedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerOfferDeclinedEventData IPersistableModel<AcsRouterWorkerOfferDeclinedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferDeclinedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerOfferDeclinedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferDeclinedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerOfferDeclinedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterWorkerOfferDeclinedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerOfferDeclinedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferDeclinedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferDeclinedEventData.cs
deleted file mode 100644
index 1197ec2176a3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferDeclinedEventData.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;
-using System.Collections.Generic;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerOfferDeclined event. </summary>
-    public partial class AcsRouterWorkerOfferDeclinedEventData : AcsRouterWorkerEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferDeclinedEventData"/>. </summary>
-        internal AcsRouterWorkerOfferDeclinedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferDeclinedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Declined Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Declined Offer Id. </param>
-        internal AcsRouterWorkerOfferDeclinedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string workerId, string queueId, string offerId) : base(jobId, channelReference, channelId, serializedAdditionalRawData, workerId)
-        {
-            QueueId = queueId;
-            OfferId = offerId;
-        }
-
-        /// <summary> Router Worker Offer Declined Queue Id. </summary>
-        public string QueueId { get; }
-        /// <summary> Router Worker Offer Declined Offer Id. </summary>
-        public string OfferId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferExpiredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferExpiredEventData.Serialization.cs
deleted file mode 100644
index 9dc8153fd970..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferExpiredEventData.Serialization.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerOfferExpiredEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerOfferExpiredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerOfferExpiredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerOfferExpiredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferExpiredEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(QueueId))
-            {
-                writer.WritePropertyName("queueId"u8);
-                writer.WriteStringValue(QueueId);
-            }
-            if (Optional.IsDefined(OfferId))
-            {
-                writer.WritePropertyName("offerId"u8);
-                writer.WriteStringValue(OfferId);
-            }
-        }
-
-        AcsRouterWorkerOfferExpiredEventData IJsonModel<AcsRouterWorkerOfferExpiredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferExpiredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerOfferExpiredEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerOfferExpiredEventData DeserializeAcsRouterWorkerOfferExpiredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string queueId = default;
-            string offerId = default;
-            string workerId = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("offerId"u8))
-                {
-                    offerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerOfferExpiredEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                workerId,
-                queueId,
-                offerId);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerOfferExpiredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferExpiredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerOfferExpiredEventData IPersistableModel<AcsRouterWorkerOfferExpiredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerOfferExpiredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferExpiredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerOfferExpiredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterWorkerOfferExpiredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerOfferExpiredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferExpiredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferExpiredEventData.cs
deleted file mode 100644
index 2b67e73ec019..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferExpiredEventData.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;
-using System.Collections.Generic;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerOfferExpired event. </summary>
-    public partial class AcsRouterWorkerOfferExpiredEventData : AcsRouterWorkerEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferExpiredEventData"/>. </summary>
-        internal AcsRouterWorkerOfferExpiredEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferExpiredEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Expired Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Expired Offer Id. </param>
-        internal AcsRouterWorkerOfferExpiredEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string workerId, string queueId, string offerId) : base(jobId, channelReference, channelId, serializedAdditionalRawData, workerId)
-        {
-            QueueId = queueId;
-            OfferId = offerId;
-        }
-
-        /// <summary> Router Worker Offer Expired Queue Id. </summary>
-        public string QueueId { get; }
-        /// <summary> Router Worker Offer Expired Offer Id. </summary>
-        public string OfferId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferIssuedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferIssuedEventData.Serialization.cs
deleted file mode 100644
index 817a8da1b0fd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferIssuedEventData.Serialization.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerOfferIssuedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerOfferIssuedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerOfferIssuedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerOfferIssuedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferIssuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferIssuedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(QueueId))
-            {
-                writer.WritePropertyName("queueId"u8);
-                writer.WriteStringValue(QueueId);
-            }
-            if (Optional.IsDefined(OfferId))
-            {
-                writer.WritePropertyName("offerId"u8);
-                writer.WriteStringValue(OfferId);
-            }
-            if (Optional.IsDefined(JobPriority))
-            {
-                writer.WritePropertyName("jobPriority"u8);
-                writer.WriteNumberValue(JobPriority.Value);
-            }
-            writer.WritePropertyName("workerLabels"u8);
-            writer.WriteStartObject();
-            foreach (var item in WorkerLabels)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("offeredOn"u8);
-            writer.WriteStringValue(OfferedOn, "O");
-            writer.WritePropertyName("expiresOn"u8);
-            writer.WriteStringValue(ExpiresOn, "O");
-            writer.WritePropertyName("workerTags"u8);
-            writer.WriteStartObject();
-            foreach (var item in WorkerTags)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("jobLabels"u8);
-            writer.WriteStartObject();
-            foreach (var item in JobLabels)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("jobTags"u8);
-            writer.WriteStartObject();
-            foreach (var item in JobTags)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-        }
-
-        AcsRouterWorkerOfferIssuedEventData IJsonModel<AcsRouterWorkerOfferIssuedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferIssuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferIssuedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerOfferIssuedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerOfferIssuedEventData DeserializeAcsRouterWorkerOfferIssuedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string queueId = default;
-            string offerId = default;
-            int? jobPriority = default;
-            IReadOnlyDictionary<string, string> workerLabels = default;
-            DateTimeOffset offeredOn = default;
-            DateTimeOffset expiresOn = default;
-            IReadOnlyDictionary<string, string> workerTags = default;
-            IReadOnlyDictionary<string, string> jobLabels = default;
-            IReadOnlyDictionary<string, string> jobTags = default;
-            string workerId = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("offerId"u8))
-                {
-                    offerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobPriority"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    jobPriority = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("workerLabels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    workerLabels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("offeredOn"u8))
-                {
-                    offeredOn = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("expiresOn"u8))
-                {
-                    expiresOn = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("workerTags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    workerTags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobLabels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobLabels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("jobTags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobTags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerOfferIssuedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                workerId,
-                queueId,
-                offerId,
-                jobPriority,
-                workerLabels,
-                offeredOn,
-                expiresOn,
-                workerTags,
-                jobLabels,
-                jobTags);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerOfferIssuedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferIssuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferIssuedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerOfferIssuedEventData IPersistableModel<AcsRouterWorkerOfferIssuedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferIssuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerOfferIssuedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferIssuedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerOfferIssuedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterWorkerOfferIssuedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerOfferIssuedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferIssuedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferIssuedEventData.cs
deleted file mode 100644
index f964beba9d50..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferIssuedEventData.cs
+++ /dev/null
@@ -1,91 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerOfferIssued event. </summary>
-    public partial class AcsRouterWorkerOfferIssuedEventData : AcsRouterWorkerEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferIssuedEventData"/>. </summary>
-        /// <param name="workerLabels"> Router Worker Offer Issued Worker Labels. </param>
-        /// <param name="offeredOn"> Router Worker Offer Issued Time in UTC. </param>
-        /// <param name="expiresOn"> Router Worker Offer Issued Expiration Time in UTC. </param>
-        /// <param name="workerTags"> Router Worker Offer Issued Worker Tags. </param>
-        /// <param name="jobLabels"> Router Worker Offer Issued Job Labels. </param>
-        /// <param name="jobTags"> Router Worker Offer Issued Job Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="workerLabels"/>, <paramref name="workerTags"/>, <paramref name="jobLabels"/> or <paramref name="jobTags"/> is null. </exception>
-        internal AcsRouterWorkerOfferIssuedEventData(IReadOnlyDictionary<string, string> workerLabels, DateTimeOffset offeredOn, DateTimeOffset expiresOn, IReadOnlyDictionary<string, string> workerTags, IReadOnlyDictionary<string, string> jobLabels, IReadOnlyDictionary<string, string> jobTags)
-        {
-            Argument.AssertNotNull(workerLabels, nameof(workerLabels));
-            Argument.AssertNotNull(workerTags, nameof(workerTags));
-            Argument.AssertNotNull(jobLabels, nameof(jobLabels));
-            Argument.AssertNotNull(jobTags, nameof(jobTags));
-
-            WorkerLabels = workerLabels;
-            OfferedOn = offeredOn;
-            ExpiresOn = expiresOn;
-            WorkerTags = workerTags;
-            JobLabels = jobLabels;
-            JobTags = jobTags;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferIssuedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Issued Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Issued Offer Id. </param>
-        /// <param name="jobPriority"> Router Worker Offer Issued Job Priority. </param>
-        /// <param name="workerLabels"> Router Worker Offer Issued Worker Labels. </param>
-        /// <param name="offeredOn"> Router Worker Offer Issued Time in UTC. </param>
-        /// <param name="expiresOn"> Router Worker Offer Issued Expiration Time in UTC. </param>
-        /// <param name="workerTags"> Router Worker Offer Issued Worker Tags. </param>
-        /// <param name="jobLabels"> Router Worker Offer Issued Job Labels. </param>
-        /// <param name="jobTags"> Router Worker Offer Issued Job Tags. </param>
-        internal AcsRouterWorkerOfferIssuedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string workerId, string queueId, string offerId, int? jobPriority, IReadOnlyDictionary<string, string> workerLabels, DateTimeOffset offeredOn, DateTimeOffset expiresOn, IReadOnlyDictionary<string, string> workerTags, IReadOnlyDictionary<string, string> jobLabels, IReadOnlyDictionary<string, string> jobTags) : base(jobId, channelReference, channelId, serializedAdditionalRawData, workerId)
-        {
-            QueueId = queueId;
-            OfferId = offerId;
-            JobPriority = jobPriority;
-            WorkerLabels = workerLabels;
-            OfferedOn = offeredOn;
-            ExpiresOn = expiresOn;
-            WorkerTags = workerTags;
-            JobLabels = jobLabels;
-            JobTags = jobTags;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferIssuedEventData"/> for deserialization. </summary>
-        internal AcsRouterWorkerOfferIssuedEventData()
-        {
-        }
-
-        /// <summary> Router Worker Offer Issued Queue Id. </summary>
-        public string QueueId { get; }
-        /// <summary> Router Worker Offer Issued Offer Id. </summary>
-        public string OfferId { get; }
-        /// <summary> Router Worker Offer Issued Job Priority. </summary>
-        public int? JobPriority { get; }
-        /// <summary> Router Worker Offer Issued Worker Labels. </summary>
-        public IReadOnlyDictionary<string, string> WorkerLabels { get; }
-        /// <summary> Router Worker Offer Issued Time in UTC. </summary>
-        public DateTimeOffset OfferedOn { get; }
-        /// <summary> Router Worker Offer Issued Expiration Time in UTC. </summary>
-        public DateTimeOffset ExpiresOn { get; }
-        /// <summary> Router Worker Offer Issued Worker Tags. </summary>
-        public IReadOnlyDictionary<string, string> WorkerTags { get; }
-        /// <summary> Router Worker Offer Issued Job Labels. </summary>
-        public IReadOnlyDictionary<string, string> JobLabels { get; }
-        /// <summary> Router Worker Offer Issued Job Tags. </summary>
-        public IReadOnlyDictionary<string, string> JobTags { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferRevokedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferRevokedEventData.Serialization.cs
deleted file mode 100644
index 30122510eb90..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferRevokedEventData.Serialization.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerOfferRevokedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerOfferRevokedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerOfferRevokedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerOfferRevokedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferRevokedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferRevokedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(QueueId))
-            {
-                writer.WritePropertyName("queueId"u8);
-                writer.WriteStringValue(QueueId);
-            }
-            if (Optional.IsDefined(OfferId))
-            {
-                writer.WritePropertyName("offerId"u8);
-                writer.WriteStringValue(OfferId);
-            }
-        }
-
-        AcsRouterWorkerOfferRevokedEventData IJsonModel<AcsRouterWorkerOfferRevokedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferRevokedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerOfferRevokedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerOfferRevokedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerOfferRevokedEventData DeserializeAcsRouterWorkerOfferRevokedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string queueId = default;
-            string offerId = default;
-            string workerId = default;
-            string jobId = default;
-            string channelReference = default;
-            string channelId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queueId"u8))
-                {
-                    queueId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("offerId"u8))
-                {
-                    offerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("jobId"u8))
-                {
-                    jobId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelReference"u8))
-                {
-                    channelReference = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("channelId"u8))
-                {
-                    channelId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerOfferRevokedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData,
-                workerId,
-                queueId,
-                offerId);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerOfferRevokedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferRevokedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferRevokedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerOfferRevokedEventData IPersistableModel<AcsRouterWorkerOfferRevokedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerOfferRevokedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerOfferRevokedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerOfferRevokedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerOfferRevokedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsRouterWorkerOfferRevokedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerOfferRevokedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferRevokedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferRevokedEventData.cs
deleted file mode 100644
index 79f37f345b28..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerOfferRevokedEventData.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;
-using System.Collections.Generic;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerOfferRevoked event. </summary>
-    public partial class AcsRouterWorkerOfferRevokedEventData : AcsRouterWorkerEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferRevokedEventData"/>. </summary>
-        internal AcsRouterWorkerOfferRevokedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerOfferRevokedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Revoked Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Revoked Offer Id. </param>
-        internal AcsRouterWorkerOfferRevokedEventData(string jobId, string channelReference, string channelId, IDictionary<string, BinaryData> serializedAdditionalRawData, string workerId, string queueId, string offerId) : base(jobId, channelReference, channelId, serializedAdditionalRawData, workerId)
-        {
-            QueueId = queueId;
-            OfferId = offerId;
-        }
-
-        /// <summary> Router Worker Offer Revoked Queue Id. </summary>
-        public string QueueId { get; }
-        /// <summary> Router Worker Offer Revoked Offer Id. </summary>
-        public string OfferId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerRegisteredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerRegisteredEventData.Serialization.cs
deleted file mode 100644
index 22dbe3708dc4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerRegisteredEventData.Serialization.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerRegisteredEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerRegisteredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerRegisteredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerRegisteredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerRegisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerRegisteredEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(WorkerId))
-            {
-                writer.WritePropertyName("workerId"u8);
-                writer.WriteStringValue(WorkerId);
-            }
-            writer.WritePropertyName("queueAssignments"u8);
-            writer.WriteStartArray();
-            foreach (var item in QueueAssignments)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("channelConfigurations"u8);
-            writer.WriteStartArray();
-            foreach (var item in ChannelConfigurations)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            if (Optional.IsDefined(TotalCapacity))
-            {
-                writer.WritePropertyName("totalCapacity"u8);
-                writer.WriteNumberValue(TotalCapacity.Value);
-            }
-            writer.WritePropertyName("labels"u8);
-            writer.WriteStartObject();
-            foreach (var item in Labels)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("tags"u8);
-            writer.WriteStartObject();
-            foreach (var item in Tags)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRouterWorkerRegisteredEventData IJsonModel<AcsRouterWorkerRegisteredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerRegisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerRegisteredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerRegisteredEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerRegisteredEventData DeserializeAcsRouterWorkerRegisteredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string workerId = default;
-            IReadOnlyList<AcsRouterQueueDetails> queueAssignments = default;
-            IReadOnlyList<AcsRouterChannelConfiguration> channelConfigurations = default;
-            int? totalCapacity = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueAssignments"u8))
-                {
-                    List<AcsRouterQueueDetails> array = new List<AcsRouterQueueDetails>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterQueueDetails.DeserializeAcsRouterQueueDetails(item, options));
-                    }
-                    queueAssignments = array;
-                    continue;
-                }
-                if (property.NameEquals("channelConfigurations"u8))
-                {
-                    List<AcsRouterChannelConfiguration> array = new List<AcsRouterChannelConfiguration>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterChannelConfiguration.DeserializeAcsRouterChannelConfiguration(item, options));
-                    }
-                    channelConfigurations = array;
-                    continue;
-                }
-                if (property.NameEquals("totalCapacity"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    totalCapacity = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerRegisteredEventData(
-                workerId,
-                queueAssignments,
-                channelConfigurations,
-                totalCapacity,
-                labels,
-                tags,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerRegisteredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerRegisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerRegisteredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerRegisteredEventData IPersistableModel<AcsRouterWorkerRegisteredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerRegisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerRegisteredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerRegisteredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerRegisteredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRouterWorkerRegisteredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerRegisteredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerRegisteredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerRegisteredEventData.cs
deleted file mode 100644
index e5b8ab2dc682..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerRegisteredEventData.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerRegistered event. </summary>
-    public partial class AcsRouterWorkerRegisteredEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerRegisteredEventData"/>. </summary>
-        /// <param name="queueAssignments"> Router Worker Registered Queue Info. </param>
-        /// <param name="channelConfigurations"> Router Worker Registered Channel Configuration. </param>
-        /// <param name="labels"> Router Worker Registered Labels. </param>
-        /// <param name="tags"> Router Worker Registered Tags. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="queueAssignments"/>, <paramref name="channelConfigurations"/>, <paramref name="labels"/> or <paramref name="tags"/> is null. </exception>
-        internal AcsRouterWorkerRegisteredEventData(IEnumerable<AcsRouterQueueDetails> queueAssignments, IEnumerable<AcsRouterChannelConfiguration> channelConfigurations, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags)
-        {
-            Argument.AssertNotNull(queueAssignments, nameof(queueAssignments));
-            Argument.AssertNotNull(channelConfigurations, nameof(channelConfigurations));
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-
-            QueueAssignments = queueAssignments.ToList();
-            ChannelConfigurations = channelConfigurations.ToList();
-            Labels = labels;
-            Tags = tags;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerRegisteredEventData"/>. </summary>
-        /// <param name="workerId"> Router Worker Registered Worker Id. </param>
-        /// <param name="queueAssignments"> Router Worker Registered Queue Info. </param>
-        /// <param name="channelConfigurations"> Router Worker Registered Channel Configuration. </param>
-        /// <param name="totalCapacity"> Router Worker Register Total Capacity. </param>
-        /// <param name="labels"> Router Worker Registered Labels. </param>
-        /// <param name="tags"> Router Worker Registered Tags. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRouterWorkerRegisteredEventData(string workerId, IReadOnlyList<AcsRouterQueueDetails> queueAssignments, IReadOnlyList<AcsRouterChannelConfiguration> channelConfigurations, int? totalCapacity, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            WorkerId = workerId;
-            QueueAssignments = queueAssignments;
-            ChannelConfigurations = channelConfigurations;
-            TotalCapacity = totalCapacity;
-            Labels = labels;
-            Tags = tags;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerRegisteredEventData"/> for deserialization. </summary>
-        internal AcsRouterWorkerRegisteredEventData()
-        {
-        }
-
-        /// <summary> Router Worker Registered Worker Id. </summary>
-        public string WorkerId { get; }
-        /// <summary> Router Worker Registered Queue Info. </summary>
-        public IReadOnlyList<AcsRouterQueueDetails> QueueAssignments { get; }
-        /// <summary> Router Worker Registered Channel Configuration. </summary>
-        public IReadOnlyList<AcsRouterChannelConfiguration> ChannelConfigurations { get; }
-        /// <summary> Router Worker Register Total Capacity. </summary>
-        public int? TotalCapacity { get; }
-        /// <summary> Router Worker Registered Labels. </summary>
-        public IReadOnlyDictionary<string, string> Labels { get; }
-        /// <summary> Router Worker Registered Tags. </summary>
-        public IReadOnlyDictionary<string, string> Tags { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelector.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelector.Serialization.cs
deleted file mode 100644
index 36871c0eb165..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelector.Serialization.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerSelector : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerSelector>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerSelector>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerSelector>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerSelector>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerSelector)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Key))
-            {
-                writer.WritePropertyName("key"u8);
-                writer.WriteStringValue(Key);
-            }
-            writer.WritePropertyName("labelOperator"u8);
-            writer.WriteStringValue(LabelOperator.ToString());
-            writer.WritePropertyName("value"u8);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(LabelValue);
-#else
-            using (JsonDocument document = JsonDocument.Parse(LabelValue))
-            {
-                JsonSerializer.Serialize(writer, document.RootElement);
-            }
-#endif
-            writer.WritePropertyName("ttlSeconds"u8);
-            writer.WriteNumberValue(TimeToLive);
-            writer.WritePropertyName("state"u8);
-            writer.WriteStringValue(SelectorState.ToString());
-            writer.WritePropertyName("expirationTime"u8);
-            writer.WriteStringValue(ExpirationTime, "O");
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRouterWorkerSelector IJsonModel<AcsRouterWorkerSelector>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerSelector>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerSelector)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerSelector(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerSelector DeserializeAcsRouterWorkerSelector(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string key = default;
-            AcsRouterLabelOperator labelOperator = default;
-            BinaryData value = default;
-            double ttlSeconds = default;
-            AcsRouterWorkerSelectorState state = default;
-            DateTimeOffset expirationTime = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("key"u8))
-                {
-                    key = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("labelOperator"u8))
-                {
-                    labelOperator = new AcsRouterLabelOperator(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("value"u8))
-                {
-                    value = BinaryData.FromString(property.Value.GetRawText());
-                    continue;
-                }
-                if (property.NameEquals("ttlSeconds"u8))
-                {
-                    ttlSeconds = property.Value.GetDouble();
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new AcsRouterWorkerSelectorState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("expirationTime"u8))
-                {
-                    expirationTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerSelector(
-                key,
-                labelOperator,
-                value,
-                ttlSeconds,
-                state,
-                expirationTime,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerSelector>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerSelector>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerSelector)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerSelector IPersistableModel<AcsRouterWorkerSelector>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerSelector>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerSelector(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerSelector)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerSelector>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRouterWorkerSelector FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerSelector(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelector.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelector.cs
deleted file mode 100644
index 0de728036de4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelector.cs
+++ /dev/null
@@ -1,132 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Router Job Worker Selector. </summary>
-    public partial class AcsRouterWorkerSelector
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerSelector"/>. </summary>
-        /// <param name="labelOperator"> Router Job Worker Selector Label Operator. </param>
-        /// <param name="labelValue"> Router Job Worker Selector Value. </param>
-        /// <param name="timeToLive"> Router Job Worker Selector Time to Live in Seconds. </param>
-        /// <param name="selectorState"> Router Job Worker Selector State. </param>
-        /// <param name="expirationTime"> Router Job Worker Selector Expiration Time. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="labelValue"/> is null. </exception>
-        internal AcsRouterWorkerSelector(AcsRouterLabelOperator labelOperator, BinaryData labelValue, double timeToLive, AcsRouterWorkerSelectorState selectorState, DateTimeOffset expirationTime)
-        {
-            Argument.AssertNotNull(labelValue, nameof(labelValue));
-
-            LabelOperator = labelOperator;
-            LabelValue = labelValue;
-            TimeToLive = timeToLive;
-            SelectorState = selectorState;
-            ExpirationTime = expirationTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerSelector"/>. </summary>
-        /// <param name="key"> Router Job Worker Selector Key. </param>
-        /// <param name="labelOperator"> Router Job Worker Selector Label Operator. </param>
-        /// <param name="labelValue"> Router Job Worker Selector Value. </param>
-        /// <param name="timeToLive"> Router Job Worker Selector Time to Live in Seconds. </param>
-        /// <param name="selectorState"> Router Job Worker Selector State. </param>
-        /// <param name="expirationTime"> Router Job Worker Selector Expiration Time. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRouterWorkerSelector(string key, AcsRouterLabelOperator labelOperator, BinaryData labelValue, double timeToLive, AcsRouterWorkerSelectorState selectorState, DateTimeOffset expirationTime, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Key = key;
-            LabelOperator = labelOperator;
-            LabelValue = labelValue;
-            TimeToLive = timeToLive;
-            SelectorState = selectorState;
-            ExpirationTime = expirationTime;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerSelector"/> for deserialization. </summary>
-        internal AcsRouterWorkerSelector()
-        {
-        }
-
-        /// <summary> Router Job Worker Selector Key. </summary>
-        public string Key { get; }
-        /// <summary> Router Job Worker Selector Label Operator. </summary>
-        public AcsRouterLabelOperator LabelOperator { get; }
-        /// <summary>
-        /// Router Job Worker Selector Value
-        /// <para>
-        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public BinaryData LabelValue { get; }
-        /// <summary> Router Job Worker Selector Time to Live in Seconds. </summary>
-        public double TimeToLive { get; }
-        /// <summary> Router Job Worker Selector State. </summary>
-        public AcsRouterWorkerSelectorState SelectorState { get; }
-        /// <summary> Router Job Worker Selector Expiration Time. </summary>
-        public DateTimeOffset ExpirationTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelectorState.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelectorState.cs
deleted file mode 100644
index 9a07ed1b9780..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerSelectorState.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Router Worker Selector State. </summary>
-    public readonly partial struct AcsRouterWorkerSelectorState : IEquatable<AcsRouterWorkerSelectorState>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerSelectorState"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsRouterWorkerSelectorState(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ActiveValue = "active";
-        private const string ExpiredValue = "expired";
-
-        /// <summary> Router Worker Selector State Active. </summary>
-        public static AcsRouterWorkerSelectorState Active { get; } = new AcsRouterWorkerSelectorState(ActiveValue);
-        /// <summary> Router Worker Selector State Expired. </summary>
-        public static AcsRouterWorkerSelectorState Expired { get; } = new AcsRouterWorkerSelectorState(ExpiredValue);
-        /// <summary> Determines if two <see cref="AcsRouterWorkerSelectorState"/> values are the same. </summary>
-        public static bool operator ==(AcsRouterWorkerSelectorState left, AcsRouterWorkerSelectorState right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsRouterWorkerSelectorState"/> values are not the same. </summary>
-        public static bool operator !=(AcsRouterWorkerSelectorState left, AcsRouterWorkerSelectorState right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsRouterWorkerSelectorState"/>. </summary>
-        public static implicit operator AcsRouterWorkerSelectorState(string value) => new AcsRouterWorkerSelectorState(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsRouterWorkerSelectorState other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsRouterWorkerSelectorState other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerUpdatedEventData.Serialization.cs
deleted file mode 100644
index bb7ac8581576..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsRouterWorkerUpdatedEventData : IUtf8JsonSerializable, IJsonModel<AcsRouterWorkerUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsRouterWorkerUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsRouterWorkerUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(WorkerId))
-            {
-                writer.WritePropertyName("workerId"u8);
-                writer.WriteStringValue(WorkerId);
-            }
-            writer.WritePropertyName("queueAssignments"u8);
-            writer.WriteStartArray();
-            foreach (var item in QueueAssignments)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("channelConfigurations"u8);
-            writer.WriteStartArray();
-            foreach (var item in ChannelConfigurations)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            if (Optional.IsDefined(TotalCapacity))
-            {
-                writer.WritePropertyName("totalCapacity"u8);
-                writer.WriteNumberValue(TotalCapacity.Value);
-            }
-            writer.WritePropertyName("labels"u8);
-            writer.WriteStartObject();
-            foreach (var item in Labels)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("tags"u8);
-            writer.WriteStartObject();
-            foreach (var item in Tags)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("updatedWorkerProperties"u8);
-            writer.WriteStartArray();
-            foreach (var item in UpdatedWorkerProperties)
-            {
-                writer.WriteStringValue(item.ToString());
-            }
-            writer.WriteEndArray();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsRouterWorkerUpdatedEventData IJsonModel<AcsRouterWorkerUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsRouterWorkerUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsRouterWorkerUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static AcsRouterWorkerUpdatedEventData DeserializeAcsRouterWorkerUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string workerId = default;
-            IReadOnlyList<AcsRouterQueueDetails> queueAssignments = default;
-            IReadOnlyList<AcsRouterChannelConfiguration> channelConfigurations = default;
-            int? totalCapacity = default;
-            IReadOnlyDictionary<string, string> labels = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            IReadOnlyList<AcsRouterUpdatedWorkerProperty> updatedWorkerProperties = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("workerId"u8))
-                {
-                    workerId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueAssignments"u8))
-                {
-                    List<AcsRouterQueueDetails> array = new List<AcsRouterQueueDetails>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterQueueDetails.DeserializeAcsRouterQueueDetails(item, options));
-                    }
-                    queueAssignments = array;
-                    continue;
-                }
-                if (property.NameEquals("channelConfigurations"u8))
-                {
-                    List<AcsRouterChannelConfiguration> array = new List<AcsRouterChannelConfiguration>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsRouterChannelConfiguration.DeserializeAcsRouterChannelConfiguration(item, options));
-                    }
-                    channelConfigurations = array;
-                    continue;
-                }
-                if (property.NameEquals("totalCapacity"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    totalCapacity = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("labels"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    labels = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("updatedWorkerProperties"u8))
-                {
-                    List<AcsRouterUpdatedWorkerProperty> array = new List<AcsRouterUpdatedWorkerProperty>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(new AcsRouterUpdatedWorkerProperty(item.GetString()));
-                    }
-                    updatedWorkerProperties = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsRouterWorkerUpdatedEventData(
-                workerId,
-                queueAssignments,
-                channelConfigurations,
-                totalCapacity,
-                labels,
-                tags,
-                updatedWorkerProperties,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsRouterWorkerUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsRouterWorkerUpdatedEventData IPersistableModel<AcsRouterWorkerUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsRouterWorkerUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsRouterWorkerUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsRouterWorkerUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsRouterWorkerUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsRouterWorkerUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsRouterWorkerUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerUpdatedEventData.cs
deleted file mode 100644
index 3d1b2b1ca992..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsRouterWorkerUpdatedEventData.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.RouterWorkerUpdated event. </summary>
-    public partial class AcsRouterWorkerUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerUpdatedEventData"/>. </summary>
-        /// <param name="queueAssignments"> Router Worker Updated Queue Info. </param>
-        /// <param name="channelConfigurations"> Router Worker Updated Channel Configuration. </param>
-        /// <param name="labels"> Router Worker Updated Labels. </param>
-        /// <param name="tags"> Router Worker Updated Tags. </param>
-        /// <param name="updatedWorkerProperties"> Router Worker Properties Updated. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="queueAssignments"/>, <paramref name="channelConfigurations"/>, <paramref name="labels"/>, <paramref name="tags"/> or <paramref name="updatedWorkerProperties"/> is null. </exception>
-        internal AcsRouterWorkerUpdatedEventData(IEnumerable<AcsRouterQueueDetails> queueAssignments, IEnumerable<AcsRouterChannelConfiguration> channelConfigurations, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IEnumerable<AcsRouterUpdatedWorkerProperty> updatedWorkerProperties)
-        {
-            Argument.AssertNotNull(queueAssignments, nameof(queueAssignments));
-            Argument.AssertNotNull(channelConfigurations, nameof(channelConfigurations));
-            Argument.AssertNotNull(labels, nameof(labels));
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(updatedWorkerProperties, nameof(updatedWorkerProperties));
-
-            QueueAssignments = queueAssignments.ToList();
-            ChannelConfigurations = channelConfigurations.ToList();
-            Labels = labels;
-            Tags = tags;
-            UpdatedWorkerProperties = updatedWorkerProperties.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerUpdatedEventData"/>. </summary>
-        /// <param name="workerId"> Router Worker Updated Worker Id. </param>
-        /// <param name="queueAssignments"> Router Worker Updated Queue Info. </param>
-        /// <param name="channelConfigurations"> Router Worker Updated Channel Configuration. </param>
-        /// <param name="totalCapacity"> Router Worker Updated Total Capacity. </param>
-        /// <param name="labels"> Router Worker Updated Labels. </param>
-        /// <param name="tags"> Router Worker Updated Tags. </param>
-        /// <param name="updatedWorkerProperties"> Router Worker Properties Updated. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsRouterWorkerUpdatedEventData(string workerId, IReadOnlyList<AcsRouterQueueDetails> queueAssignments, IReadOnlyList<AcsRouterChannelConfiguration> channelConfigurations, int? totalCapacity, IReadOnlyDictionary<string, string> labels, IReadOnlyDictionary<string, string> tags, IReadOnlyList<AcsRouterUpdatedWorkerProperty> updatedWorkerProperties, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            WorkerId = workerId;
-            QueueAssignments = queueAssignments;
-            ChannelConfigurations = channelConfigurations;
-            TotalCapacity = totalCapacity;
-            Labels = labels;
-            Tags = tags;
-            UpdatedWorkerProperties = updatedWorkerProperties;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsRouterWorkerUpdatedEventData"/> for deserialization. </summary>
-        internal AcsRouterWorkerUpdatedEventData()
-        {
-        }
-
-        /// <summary> Router Worker Updated Worker Id. </summary>
-        public string WorkerId { get; }
-        /// <summary> Router Worker Updated Queue Info. </summary>
-        public IReadOnlyList<AcsRouterQueueDetails> QueueAssignments { get; }
-        /// <summary> Router Worker Updated Channel Configuration. </summary>
-        public IReadOnlyList<AcsRouterChannelConfiguration> ChannelConfigurations { get; }
-        /// <summary> Router Worker Updated Total Capacity. </summary>
-        public int? TotalCapacity { get; }
-        /// <summary> Router Worker Updated Labels. </summary>
-        public IReadOnlyDictionary<string, string> Labels { get; }
-        /// <summary> Router Worker Updated Tags. </summary>
-        public IReadOnlyDictionary<string, string> Tags { get; }
-        /// <summary> Router Worker Properties Updated. </summary>
-        public IReadOnlyList<AcsRouterUpdatedWorkerProperty> UpdatedWorkerProperties { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryAttemptProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryAttemptProperties.Serialization.cs
deleted file mode 100644
index b717e628d80f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryAttemptProperties.Serialization.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsSmsDeliveryAttemptProperties : IUtf8JsonSerializable, IJsonModel<AcsSmsDeliveryAttemptProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsSmsDeliveryAttemptProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsSmsDeliveryAttemptProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsDeliveryAttemptProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsSmsDeliveryAttemptProperties)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(SegmentsSucceeded))
-            {
-                writer.WritePropertyName("segmentsSucceeded"u8);
-                writer.WriteNumberValue(SegmentsSucceeded.Value);
-            }
-            if (Optional.IsDefined(SegmentsFailed))
-            {
-                writer.WritePropertyName("segmentsFailed"u8);
-                writer.WriteNumberValue(SegmentsFailed.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsSmsDeliveryAttemptProperties IJsonModel<AcsSmsDeliveryAttemptProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsDeliveryAttemptProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsSmsDeliveryAttemptProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsSmsDeliveryAttemptProperties(document.RootElement, options);
-        }
-
-        internal static AcsSmsDeliveryAttemptProperties DeserializeAcsSmsDeliveryAttemptProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            int? segmentsSucceeded = default;
-            int? segmentsFailed = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("segmentsSucceeded"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    segmentsSucceeded = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("segmentsFailed"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    segmentsFailed = property.Value.GetInt32();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsSmsDeliveryAttemptProperties(timestamp, segmentsSucceeded, segmentsFailed, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsSmsDeliveryAttemptProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsDeliveryAttemptProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsSmsDeliveryAttemptProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsSmsDeliveryAttemptProperties IPersistableModel<AcsSmsDeliveryAttemptProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsDeliveryAttemptProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsSmsDeliveryAttemptProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsSmsDeliveryAttemptProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsSmsDeliveryAttemptProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsSmsDeliveryAttemptProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsSmsDeliveryAttemptProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryAttemptProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryAttemptProperties.cs
deleted file mode 100644
index 79cc8014347e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryAttemptProperties.cs
+++ /dev/null
@@ -1,80 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema for details of a delivery attempt. </summary>
-    public partial class AcsSmsDeliveryAttemptProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsDeliveryAttemptProperties"/>. </summary>
-        /// <param name="timestamp"> TimeStamp when delivery was attempted. </param>
-        internal AcsSmsDeliveryAttemptProperties(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsDeliveryAttemptProperties"/>. </summary>
-        /// <param name="timestamp"> TimeStamp when delivery was attempted. </param>
-        /// <param name="segmentsSucceeded"> Number of segments that were successfully delivered. </param>
-        /// <param name="segmentsFailed"> Number of segments whose delivery failed. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsSmsDeliveryAttemptProperties(DateTimeOffset timestamp, int? segmentsSucceeded, int? segmentsFailed, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            SegmentsSucceeded = segmentsSucceeded;
-            SegmentsFailed = segmentsFailed;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsDeliveryAttemptProperties"/> for deserialization. </summary>
-        internal AcsSmsDeliveryAttemptProperties()
-        {
-        }
-
-        /// <summary> TimeStamp when delivery was attempted. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> Number of segments that were successfully delivered. </summary>
-        public int? SegmentsSucceeded { get; }
-        /// <summary> Number of segments whose delivery failed. </summary>
-        public int? SegmentsFailed { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryReportReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryReportReceivedEventData.Serialization.cs
deleted file mode 100644
index 3daf4e3535c6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryReportReceivedEventData.Serialization.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsSmsDeliveryReportReceivedEventData : IUtf8JsonSerializable, IJsonModel<AcsSmsDeliveryReportReceivedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsSmsDeliveryReportReceivedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsSmsDeliveryReportReceivedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsDeliveryReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsSmsDeliveryReportReceivedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(DeliveryStatus))
-            {
-                writer.WritePropertyName("deliveryStatus"u8);
-                writer.WriteStringValue(DeliveryStatus);
-            }
-            if (Optional.IsDefined(DeliveryStatusDetails))
-            {
-                writer.WritePropertyName("deliveryStatusDetails"u8);
-                writer.WriteStringValue(DeliveryStatusDetails);
-            }
-            writer.WritePropertyName("deliveryAttempts"u8);
-            writer.WriteStartArray();
-            foreach (var item in DeliveryAttempts)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            writer.WritePropertyName("receivedTimestamp"u8);
-            writer.WriteStringValue(ReceivedTimestamp, "O");
-            if (Optional.IsDefined(Tag))
-            {
-                writer.WritePropertyName("tag"u8);
-                writer.WriteStringValue(Tag);
-            }
-        }
-
-        AcsSmsDeliveryReportReceivedEventData IJsonModel<AcsSmsDeliveryReportReceivedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsDeliveryReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsSmsDeliveryReportReceivedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsSmsDeliveryReportReceivedEventData(document.RootElement, options);
-        }
-
-        internal static AcsSmsDeliveryReportReceivedEventData DeserializeAcsSmsDeliveryReportReceivedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deliveryStatus = default;
-            string deliveryStatusDetails = default;
-            IReadOnlyList<AcsSmsDeliveryAttemptProperties> deliveryAttempts = default;
-            DateTimeOffset receivedTimestamp = default;
-            string tag = default;
-            string messageId = default;
-            string @from = default;
-            string to = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deliveryStatus"u8))
-                {
-                    deliveryStatus = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("deliveryStatusDetails"u8))
-                {
-                    deliveryStatusDetails = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("deliveryAttempts"u8))
-                {
-                    List<AcsSmsDeliveryAttemptProperties> array = new List<AcsSmsDeliveryAttemptProperties>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(AcsSmsDeliveryAttemptProperties.DeserializeAcsSmsDeliveryAttemptProperties(item, options));
-                    }
-                    deliveryAttempts = array;
-                    continue;
-                }
-                if (property.NameEquals("receivedTimestamp"u8))
-                {
-                    receivedTimestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("tag"u8))
-                {
-                    tag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("from"u8))
-                {
-                    @from = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("to"u8))
-                {
-                    to = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsSmsDeliveryReportReceivedEventData(
-                messageId,
-                @from,
-                to,
-                serializedAdditionalRawData,
-                deliveryStatus,
-                deliveryStatusDetails,
-                deliveryAttempts,
-                receivedTimestamp,
-                tag);
-        }
-
-        BinaryData IPersistableModel<AcsSmsDeliveryReportReceivedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsDeliveryReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsSmsDeliveryReportReceivedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsSmsDeliveryReportReceivedEventData IPersistableModel<AcsSmsDeliveryReportReceivedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsDeliveryReportReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsSmsDeliveryReportReceivedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsSmsDeliveryReportReceivedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsSmsDeliveryReportReceivedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsSmsDeliveryReportReceivedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsSmsDeliveryReportReceivedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryReportReceivedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryReportReceivedEventData.cs
deleted file mode 100644
index 3f14eeca621a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsDeliveryReportReceivedEventData.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.SMSDeliveryReportReceived event. </summary>
-    public partial class AcsSmsDeliveryReportReceivedEventData : AcsSmsEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsSmsDeliveryReportReceivedEventData"/>. </summary>
-        /// <param name="deliveryAttempts"> List of details of delivery attempts made. </param>
-        /// <param name="receivedTimestamp"> The time at which the SMS delivery report was received. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="deliveryAttempts"/> is null. </exception>
-        internal AcsSmsDeliveryReportReceivedEventData(IEnumerable<AcsSmsDeliveryAttemptProperties> deliveryAttempts, DateTimeOffset receivedTimestamp)
-        {
-            Argument.AssertNotNull(deliveryAttempts, nameof(deliveryAttempts));
-
-            DeliveryAttempts = deliveryAttempts.ToList();
-            ReceivedTimestamp = receivedTimestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsDeliveryReportReceivedEventData"/>. </summary>
-        /// <param name="messageId"> The identity of the SMS message. </param>
-        /// <param name="from"> The identity of SMS message sender. </param>
-        /// <param name="to"> The identity of SMS message receiver. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="deliveryStatus"> Status of Delivery. </param>
-        /// <param name="deliveryStatusDetails"> Details about Delivery Status. </param>
-        /// <param name="deliveryAttempts"> List of details of delivery attempts made. </param>
-        /// <param name="receivedTimestamp"> The time at which the SMS delivery report was received. </param>
-        /// <param name="tag"> Customer Content. </param>
-        internal AcsSmsDeliveryReportReceivedEventData(string messageId, string @from, string to, IDictionary<string, BinaryData> serializedAdditionalRawData, string deliveryStatus, string deliveryStatusDetails, IReadOnlyList<AcsSmsDeliveryAttemptProperties> deliveryAttempts, DateTimeOffset receivedTimestamp, string tag) : base(messageId, @from, to, serializedAdditionalRawData)
-        {
-            DeliveryStatus = deliveryStatus;
-            DeliveryStatusDetails = deliveryStatusDetails;
-            DeliveryAttempts = deliveryAttempts;
-            ReceivedTimestamp = receivedTimestamp;
-            Tag = tag;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsDeliveryReportReceivedEventData"/> for deserialization. </summary>
-        internal AcsSmsDeliveryReportReceivedEventData()
-        {
-        }
-
-        /// <summary> Status of Delivery. </summary>
-        public string DeliveryStatus { get; }
-        /// <summary> Details about Delivery Status. </summary>
-        public string DeliveryStatusDetails { get; }
-        /// <summary> List of details of delivery attempts made. </summary>
-        public IReadOnlyList<AcsSmsDeliveryAttemptProperties> DeliveryAttempts { get; }
-        /// <summary> The time at which the SMS delivery report was received. </summary>
-        public DateTimeOffset ReceivedTimestamp { get; }
-        /// <summary> Customer Content. </summary>
-        public string Tag { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsEventBaseProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsEventBaseProperties.Serialization.cs
deleted file mode 100644
index 65ba807bd87f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsEventBaseProperties.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsSmsEventBaseProperties : IUtf8JsonSerializable, IJsonModel<AcsSmsEventBaseProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsSmsEventBaseProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsSmsEventBaseProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsSmsEventBaseProperties)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(MessageId))
-            {
-                writer.WritePropertyName("messageId"u8);
-                writer.WriteStringValue(MessageId);
-            }
-            if (Optional.IsDefined(From))
-            {
-                writer.WritePropertyName("from"u8);
-                writer.WriteStringValue(From);
-            }
-            if (Optional.IsDefined(To))
-            {
-                writer.WritePropertyName("to"u8);
-                writer.WriteStringValue(To);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsSmsEventBaseProperties IJsonModel<AcsSmsEventBaseProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsSmsEventBaseProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsSmsEventBaseProperties(document.RootElement, options);
-        }
-
-        internal static AcsSmsEventBaseProperties DeserializeAcsSmsEventBaseProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string messageId = default;
-            string @from = default;
-            string to = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("from"u8))
-                {
-                    @from = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("to"u8))
-                {
-                    to = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsSmsEventBaseProperties(messageId, @from, to, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsSmsEventBaseProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsSmsEventBaseProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsSmsEventBaseProperties IPersistableModel<AcsSmsEventBaseProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsEventBaseProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsSmsEventBaseProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsSmsEventBaseProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsSmsEventBaseProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsSmsEventBaseProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsSmsEventBaseProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsEventBaseProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsEventBaseProperties.cs
deleted file mode 100644
index 4374d09b5603..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsEventBaseProperties.cs
+++ /dev/null
@@ -1,73 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of all SMS events. </summary>
-    public partial class AcsSmsEventBaseProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsEventBaseProperties"/>. </summary>
-        internal AcsSmsEventBaseProperties()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsEventBaseProperties"/>. </summary>
-        /// <param name="messageId"> The identity of the SMS message. </param>
-        /// <param name="from"> The identity of SMS message sender. </param>
-        /// <param name="to"> The identity of SMS message receiver. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsSmsEventBaseProperties(string messageId, string @from, string to, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            MessageId = messageId;
-            From = @from;
-            To = to;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The identity of the SMS message. </summary>
-        public string MessageId { get; }
-        /// <summary> The identity of SMS message sender. </summary>
-        public string From { get; }
-        /// <summary> The identity of SMS message receiver. </summary>
-        public string To { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsReceivedEventData.Serialization.cs
deleted file mode 100644
index 0f08b2151d59..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsReceivedEventData.Serialization.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsSmsReceivedEventData : IUtf8JsonSerializable, IJsonModel<AcsSmsReceivedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsSmsReceivedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsSmsReceivedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsSmsReceivedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(Message))
-            {
-                writer.WritePropertyName("message"u8);
-                writer.WriteStringValue(Message);
-            }
-            writer.WritePropertyName("receivedTimestamp"u8);
-            writer.WriteStringValue(ReceivedTimestamp, "O");
-        }
-
-        AcsSmsReceivedEventData IJsonModel<AcsSmsReceivedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsSmsReceivedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsSmsReceivedEventData(document.RootElement, options);
-        }
-
-        internal static AcsSmsReceivedEventData DeserializeAcsSmsReceivedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string message = default;
-            DateTimeOffset receivedTimestamp = default;
-            string messageId = default;
-            string @from = default;
-            string to = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("message"u8))
-                {
-                    message = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("receivedTimestamp"u8))
-                {
-                    receivedTimestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("messageId"u8))
-                {
-                    messageId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("from"u8))
-                {
-                    @from = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("to"u8))
-                {
-                    to = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsSmsReceivedEventData(
-                messageId,
-                @from,
-                to,
-                serializedAdditionalRawData,
-                message,
-                receivedTimestamp);
-        }
-
-        BinaryData IPersistableModel<AcsSmsReceivedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsSmsReceivedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsSmsReceivedEventData IPersistableModel<AcsSmsReceivedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsSmsReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsSmsReceivedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsSmsReceivedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsSmsReceivedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AcsSmsReceivedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsSmsReceivedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsReceivedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsReceivedEventData.cs
deleted file mode 100644
index 75b7cdc072c2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsSmsReceivedEventData.cs
+++ /dev/null
@@ -1,46 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Communication.SMSReceived event. </summary>
-    public partial class AcsSmsReceivedEventData : AcsSmsEventBaseProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="AcsSmsReceivedEventData"/>. </summary>
-        /// <param name="receivedTimestamp"> The time at which the SMS was received. </param>
-        internal AcsSmsReceivedEventData(DateTimeOffset receivedTimestamp)
-        {
-            ReceivedTimestamp = receivedTimestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsReceivedEventData"/>. </summary>
-        /// <param name="messageId"> The identity of the SMS message. </param>
-        /// <param name="from"> The identity of SMS message sender. </param>
-        /// <param name="to"> The identity of SMS message receiver. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="message"> The SMS content. </param>
-        /// <param name="receivedTimestamp"> The time at which the SMS was received. </param>
-        internal AcsSmsReceivedEventData(string messageId, string @from, string to, IDictionary<string, BinaryData> serializedAdditionalRawData, string message, DateTimeOffset receivedTimestamp) : base(messageId, @from, to, serializedAdditionalRawData)
-        {
-            Message = message;
-            ReceivedTimestamp = receivedTimestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsSmsReceivedEventData"/> for deserialization. </summary>
-        internal AcsSmsReceivedEventData()
-        {
-        }
-
-        /// <summary> The SMS content. </summary>
-        public string Message { get; }
-        /// <summary> The time at which the SMS was received. </summary>
-        public DateTimeOffset ReceivedTimestamp { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserDisconnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserDisconnectedEventData.Serialization.cs
deleted file mode 100644
index 611bd185e924..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserDisconnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AcsUserDisconnectedEventData : IUtf8JsonSerializable, IJsonModel<AcsUserDisconnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AcsUserDisconnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AcsUserDisconnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsUserDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsUserDisconnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("userCommunicationIdentifier"u8);
-            writer.WriteObjectValue(UserCommunicationIdentifier, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AcsUserDisconnectedEventData IJsonModel<AcsUserDisconnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsUserDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AcsUserDisconnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAcsUserDisconnectedEventData(document.RootElement, options);
-        }
-
-        internal static AcsUserDisconnectedEventData DeserializeAcsUserDisconnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModel userCommunicationIdentifier = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("userCommunicationIdentifier"u8))
-                {
-                    userCommunicationIdentifier = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AcsUserDisconnectedEventData(userCommunicationIdentifier, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AcsUserDisconnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsUserDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AcsUserDisconnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AcsUserDisconnectedEventData IPersistableModel<AcsUserDisconnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AcsUserDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAcsUserDisconnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AcsUserDisconnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AcsUserDisconnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AcsUserDisconnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAcsUserDisconnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserDisconnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserDisconnectedEventData.cs
deleted file mode 100644
index 5dcfa4a59766..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserDisconnectedEventData.cs
+++ /dev/null
@@ -1,75 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for an Microsoft.Communication.UserDisconnected event. </summary>
-    public partial class AcsUserDisconnectedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AcsUserDisconnectedEventData"/>. </summary>
-        /// <param name="userCommunicationIdentifier"> The communication identifier of the user who was disconnected. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="userCommunicationIdentifier"/> is null. </exception>
-        internal AcsUserDisconnectedEventData(CommunicationIdentifierModel userCommunicationIdentifier)
-        {
-            Argument.AssertNotNull(userCommunicationIdentifier, nameof(userCommunicationIdentifier));
-
-            UserCommunicationIdentifier = userCommunicationIdentifier;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsUserDisconnectedEventData"/>. </summary>
-        /// <param name="userCommunicationIdentifier"> The communication identifier of the user who was disconnected. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AcsUserDisconnectedEventData(CommunicationIdentifierModel userCommunicationIdentifier, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            UserCommunicationIdentifier = userCommunicationIdentifier;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AcsUserDisconnectedEventData"/> for deserialization. </summary>
-        internal AcsUserDisconnectedEventData()
-        {
-        }
-
-        /// <summary> The communication identifier of the user who was disconnected. </summary>
-        public CommunicationIdentifierModel UserCommunicationIdentifier { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserEngagement.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserEngagement.cs
deleted file mode 100644
index 81dfd6b3ee1b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AcsUserEngagement.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The type of engagement user have with email. </summary>
-    public readonly partial struct AcsUserEngagement : IEquatable<AcsUserEngagement>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AcsUserEngagement"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AcsUserEngagement(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ViewValue = "view";
-        private const string ClickValue = "click";
-
-        /// <summary> View. </summary>
-        public static AcsUserEngagement View { get; } = new AcsUserEngagement(ViewValue);
-        /// <summary> Click. </summary>
-        public static AcsUserEngagement Click { get; } = new AcsUserEngagement(ClickValue);
-        /// <summary> Determines if two <see cref="AcsUserEngagement"/> values are the same. </summary>
-        public static bool operator ==(AcsUserEngagement left, AcsUserEngagement right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AcsUserEngagement"/> values are not the same. </summary>
-        public static bool operator !=(AcsUserEngagement left, AcsUserEngagement right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AcsUserEngagement"/>. </summary>
-        public static implicit operator AcsUserEngagement(string value) => new AcsUserEngagement(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AcsUserEngagement other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AcsUserEngagement other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionAddedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionAddedEventData.Serialization.cs
deleted file mode 100644
index 800e8325ee3a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionAddedEventData.Serialization.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiCenterApiDefinitionAddedEventData : IUtf8JsonSerializable, IJsonModel<ApiCenterApiDefinitionAddedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiCenterApiDefinitionAddedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiCenterApiDefinitionAddedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiDefinitionAddedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiCenterApiDefinitionAddedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Title))
-            {
-                writer.WritePropertyName("title"u8);
-                writer.WriteStringValue(Title);
-            }
-            if (Optional.IsDefined(Description))
-            {
-                writer.WritePropertyName("description"u8);
-                writer.WriteStringValue(Description);
-            }
-            writer.WritePropertyName("specification"u8);
-            writer.WriteObjectValue(Specification, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiCenterApiDefinitionAddedEventData IJsonModel<ApiCenterApiDefinitionAddedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiDefinitionAddedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiCenterApiDefinitionAddedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiCenterApiDefinitionAddedEventData(document.RootElement, options);
-        }
-
-        internal static ApiCenterApiDefinitionAddedEventData DeserializeApiCenterApiDefinitionAddedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string title = default;
-            string description = default;
-            ApiCenterApiSpecification specification = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("title"u8))
-                {
-                    title = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("description"u8))
-                {
-                    description = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("specification"u8))
-                {
-                    specification = ApiCenterApiSpecification.DeserializeApiCenterApiSpecification(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiCenterApiDefinitionAddedEventData(title, description, specification, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiCenterApiDefinitionAddedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiDefinitionAddedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiCenterApiDefinitionAddedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiCenterApiDefinitionAddedEventData IPersistableModel<ApiCenterApiDefinitionAddedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiDefinitionAddedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiCenterApiDefinitionAddedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiCenterApiDefinitionAddedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiCenterApiDefinitionAddedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiCenterApiDefinitionAddedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiCenterApiDefinitionAddedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionAddedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionAddedEventData.cs
deleted file mode 100644
index 57570dd11c36..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionAddedEventData.cs
+++ /dev/null
@@ -1,83 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the data property of an EventGridEvent for a Microsoft.ApiCenter.ApiDefinitionAdded event. </summary>
-    public partial class ApiCenterApiDefinitionAddedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiCenterApiDefinitionAddedEventData"/>. </summary>
-        /// <param name="specification"> API definition specification. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="specification"/> is null. </exception>
-        internal ApiCenterApiDefinitionAddedEventData(ApiCenterApiSpecification specification)
-        {
-            Argument.AssertNotNull(specification, nameof(specification));
-
-            Specification = specification;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiCenterApiDefinitionAddedEventData"/>. </summary>
-        /// <param name="title"> API definition title. </param>
-        /// <param name="description"> API definition description. </param>
-        /// <param name="specification"> API definition specification. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiCenterApiDefinitionAddedEventData(string title, string description, ApiCenterApiSpecification specification, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Title = title;
-            Description = description;
-            Specification = specification;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiCenterApiDefinitionAddedEventData"/> for deserialization. </summary>
-        internal ApiCenterApiDefinitionAddedEventData()
-        {
-        }
-
-        /// <summary> API definition title. </summary>
-        public string Title { get; }
-        /// <summary> API definition description. </summary>
-        public string Description { get; }
-        /// <summary> API definition specification. </summary>
-        public ApiCenterApiSpecification Specification { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionUpdatedEventData.Serialization.cs
deleted file mode 100644
index 67da914fdaef..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiCenterApiDefinitionUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiCenterApiDefinitionUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiCenterApiDefinitionUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiCenterApiDefinitionUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiDefinitionUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiCenterApiDefinitionUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Title))
-            {
-                writer.WritePropertyName("title"u8);
-                writer.WriteStringValue(Title);
-            }
-            if (Optional.IsDefined(Description))
-            {
-                writer.WritePropertyName("description"u8);
-                writer.WriteStringValue(Description);
-            }
-            writer.WritePropertyName("specification"u8);
-            writer.WriteObjectValue(Specification, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiCenterApiDefinitionUpdatedEventData IJsonModel<ApiCenterApiDefinitionUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiDefinitionUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiCenterApiDefinitionUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiCenterApiDefinitionUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiCenterApiDefinitionUpdatedEventData DeserializeApiCenterApiDefinitionUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string title = default;
-            string description = default;
-            ApiCenterApiSpecification specification = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("title"u8))
-                {
-                    title = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("description"u8))
-                {
-                    description = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("specification"u8))
-                {
-                    specification = ApiCenterApiSpecification.DeserializeApiCenterApiSpecification(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiCenterApiDefinitionUpdatedEventData(title, description, specification, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiCenterApiDefinitionUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiDefinitionUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiCenterApiDefinitionUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiCenterApiDefinitionUpdatedEventData IPersistableModel<ApiCenterApiDefinitionUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiDefinitionUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiCenterApiDefinitionUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiCenterApiDefinitionUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiCenterApiDefinitionUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiCenterApiDefinitionUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiCenterApiDefinitionUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionUpdatedEventData.cs
deleted file mode 100644
index cc06633b915f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiDefinitionUpdatedEventData.cs
+++ /dev/null
@@ -1,83 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the data property of an EventGridEvent for a Microsoft.ApiCenter.ApiDefinitionUpdated event. </summary>
-    public partial class ApiCenterApiDefinitionUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiCenterApiDefinitionUpdatedEventData"/>. </summary>
-        /// <param name="specification"> API definition specification. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="specification"/> is null. </exception>
-        internal ApiCenterApiDefinitionUpdatedEventData(ApiCenterApiSpecification specification)
-        {
-            Argument.AssertNotNull(specification, nameof(specification));
-
-            Specification = specification;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiCenterApiDefinitionUpdatedEventData"/>. </summary>
-        /// <param name="title"> API definition title. </param>
-        /// <param name="description"> API definition description. </param>
-        /// <param name="specification"> API definition specification. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiCenterApiDefinitionUpdatedEventData(string title, string description, ApiCenterApiSpecification specification, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Title = title;
-            Description = description;
-            Specification = specification;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiCenterApiDefinitionUpdatedEventData"/> for deserialization. </summary>
-        internal ApiCenterApiDefinitionUpdatedEventData()
-        {
-        }
-
-        /// <summary> API definition title. </summary>
-        public string Title { get; }
-        /// <summary> API definition description. </summary>
-        public string Description { get; }
-        /// <summary> API definition specification. </summary>
-        public ApiCenterApiSpecification Specification { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiSpecification.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiSpecification.Serialization.cs
deleted file mode 100644
index 795c1c8642f9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiSpecification.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiCenterApiSpecification : IUtf8JsonSerializable, IJsonModel<ApiCenterApiSpecification>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiCenterApiSpecification>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiCenterApiSpecification>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiSpecification>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiCenterApiSpecification)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiCenterApiSpecification IJsonModel<ApiCenterApiSpecification>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiSpecification>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiCenterApiSpecification)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiCenterApiSpecification(document.RootElement, options);
-        }
-
-        internal static ApiCenterApiSpecification DeserializeApiCenterApiSpecification(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            string version = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiCenterApiSpecification(name, version, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiCenterApiSpecification>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiSpecification>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiCenterApiSpecification)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiCenterApiSpecification IPersistableModel<ApiCenterApiSpecification>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiCenterApiSpecification>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiCenterApiSpecification(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiCenterApiSpecification)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiCenterApiSpecification>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiCenterApiSpecification FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiCenterApiSpecification(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiSpecification.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiSpecification.cs
deleted file mode 100644
index 9e0f43020490..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiCenterApiSpecification.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> API specification details. </summary>
-    public partial class ApiCenterApiSpecification
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiCenterApiSpecification"/>. </summary>
-        internal ApiCenterApiSpecification()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiCenterApiSpecification"/>. </summary>
-        /// <param name="name"> Specification name. </param>
-        /// <param name="version"> Specification version. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiCenterApiSpecification(string name, string version, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Name = name;
-            Version = version;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Specification name. </summary>
-        public string Name { get; }
-        /// <summary> Specification version. </summary>
-        public string Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiCreatedEventData.Serialization.cs
deleted file mode 100644
index 37ecb8627dd2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementApiCreatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementApiCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementApiCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementApiCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementApiCreatedEventData IJsonModel<ApiManagementApiCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementApiCreatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementApiCreatedEventData DeserializeApiManagementApiCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementApiCreatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementApiCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementApiCreatedEventData IPersistableModel<ApiManagementApiCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementApiCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementApiCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementApiCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementApiCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiCreatedEventData.cs
deleted file mode 100644
index 749dcc764d1e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiCreatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.APICreated event. </summary>
-    public partial class ApiManagementApiCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiCreatedEventData"/>. </summary>
-        internal ApiManagementApiCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementApiCreatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiDeletedEventData.Serialization.cs
deleted file mode 100644
index 25351792dc41..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementApiDeletedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementApiDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementApiDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementApiDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementApiDeletedEventData IJsonModel<ApiManagementApiDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementApiDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementApiDeletedEventData DeserializeApiManagementApiDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementApiDeletedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementApiDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementApiDeletedEventData IPersistableModel<ApiManagementApiDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementApiDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementApiDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementApiDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementApiDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiDeletedEventData.cs
deleted file mode 100644
index ee98592a9300..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiDeletedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.APIDeleted event. </summary>
-    public partial class ApiManagementApiDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiDeletedEventData"/>. </summary>
-        internal ApiManagementApiDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementApiDeletedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseCreatedEventData.Serialization.cs
deleted file mode 100644
index bb621ed76bf8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementApiReleaseCreatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementApiReleaseCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementApiReleaseCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementApiReleaseCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiReleaseCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementApiReleaseCreatedEventData IJsonModel<ApiManagementApiReleaseCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiReleaseCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementApiReleaseCreatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementApiReleaseCreatedEventData DeserializeApiManagementApiReleaseCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementApiReleaseCreatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementApiReleaseCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiReleaseCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementApiReleaseCreatedEventData IPersistableModel<ApiManagementApiReleaseCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementApiReleaseCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiReleaseCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementApiReleaseCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementApiReleaseCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementApiReleaseCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseCreatedEventData.cs
deleted file mode 100644
index a1fd2b32ca6a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseCreatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.APIReleaseCreated event. </summary>
-    public partial class ApiManagementApiReleaseCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiReleaseCreatedEventData"/>. </summary>
-        internal ApiManagementApiReleaseCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiReleaseCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementApiReleaseCreatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseDeletedEventData.Serialization.cs
deleted file mode 100644
index c9a0c71fb8c5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementApiReleaseDeletedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementApiReleaseDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementApiReleaseDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementApiReleaseDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiReleaseDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementApiReleaseDeletedEventData IJsonModel<ApiManagementApiReleaseDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiReleaseDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementApiReleaseDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementApiReleaseDeletedEventData DeserializeApiManagementApiReleaseDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementApiReleaseDeletedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementApiReleaseDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiReleaseDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementApiReleaseDeletedEventData IPersistableModel<ApiManagementApiReleaseDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementApiReleaseDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiReleaseDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementApiReleaseDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementApiReleaseDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementApiReleaseDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseDeletedEventData.cs
deleted file mode 100644
index d6a29916552f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseDeletedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.APIReleaseDeleted event. </summary>
-    public partial class ApiManagementApiReleaseDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiReleaseDeletedEventData"/>. </summary>
-        internal ApiManagementApiReleaseDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiReleaseDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementApiReleaseDeletedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseUpdatedEventData.Serialization.cs
deleted file mode 100644
index c2a8785791c3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementApiReleaseUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementApiReleaseUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementApiReleaseUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementApiReleaseUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiReleaseUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementApiReleaseUpdatedEventData IJsonModel<ApiManagementApiReleaseUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiReleaseUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementApiReleaseUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementApiReleaseUpdatedEventData DeserializeApiManagementApiReleaseUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementApiReleaseUpdatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementApiReleaseUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiReleaseUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementApiReleaseUpdatedEventData IPersistableModel<ApiManagementApiReleaseUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiReleaseUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementApiReleaseUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiReleaseUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementApiReleaseUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementApiReleaseUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementApiReleaseUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseUpdatedEventData.cs
deleted file mode 100644
index 21ecd54e9cf9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiReleaseUpdatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.APIReleaseUpdated event. </summary>
-    public partial class ApiManagementApiReleaseUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiReleaseUpdatedEventData"/>. </summary>
-        internal ApiManagementApiReleaseUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiReleaseUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementApiReleaseUpdatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiUpdatedEventData.Serialization.cs
deleted file mode 100644
index d5f1490488f7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementApiUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementApiUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementApiUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementApiUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementApiUpdatedEventData IJsonModel<ApiManagementApiUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementApiUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementApiUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementApiUpdatedEventData DeserializeApiManagementApiUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementApiUpdatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementApiUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementApiUpdatedEventData IPersistableModel<ApiManagementApiUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementApiUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementApiUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementApiUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementApiUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementApiUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementApiUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiUpdatedEventData.cs
deleted file mode 100644
index 6f7d3444dd2a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementApiUpdatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.APIUpdated event. </summary>
-    public partial class ApiManagementApiUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiUpdatedEventData"/>. </summary>
-        internal ApiManagementApiUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementApiUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementApiUpdatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiAddedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiAddedEventData.Serialization.cs
deleted file mode 100644
index 475b185487ad..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiAddedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayApiAddedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayApiAddedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayApiAddedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayApiAddedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayApiAddedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayApiAddedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayApiAddedEventData IJsonModel<ApiManagementGatewayApiAddedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayApiAddedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayApiAddedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayApiAddedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayApiAddedEventData DeserializeApiManagementGatewayApiAddedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayApiAddedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayApiAddedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayApiAddedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayApiAddedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayApiAddedEventData IPersistableModel<ApiManagementGatewayApiAddedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayApiAddedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayApiAddedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayApiAddedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayApiAddedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayApiAddedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayApiAddedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiAddedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiAddedEventData.cs
deleted file mode 100644
index a044af7e7b8a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiAddedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayAPIAdded event. </summary>
-    public partial class ApiManagementGatewayApiAddedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayApiAddedEventData"/>. </summary>
-        internal ApiManagementGatewayApiAddedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayApiAddedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/apis/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayApiAddedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/apis/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiRemovedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiRemovedEventData.Serialization.cs
deleted file mode 100644
index 35dc0c246114..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiRemovedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayApiRemovedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayApiRemovedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayApiRemovedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayApiRemovedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayApiRemovedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayApiRemovedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayApiRemovedEventData IJsonModel<ApiManagementGatewayApiRemovedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayApiRemovedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayApiRemovedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayApiRemovedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayApiRemovedEventData DeserializeApiManagementGatewayApiRemovedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayApiRemovedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayApiRemovedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayApiRemovedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayApiRemovedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayApiRemovedEventData IPersistableModel<ApiManagementGatewayApiRemovedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayApiRemovedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayApiRemovedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayApiRemovedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayApiRemovedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayApiRemovedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayApiRemovedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiRemovedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiRemovedEventData.cs
deleted file mode 100644
index 672face4a74c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayApiRemovedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayAPIRemoved event. </summary>
-    public partial class ApiManagementGatewayApiRemovedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayApiRemovedEventData"/>. </summary>
-        internal ApiManagementGatewayApiRemovedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayApiRemovedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/apis/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayApiRemovedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/apis/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityCreatedEventData.Serialization.cs
deleted file mode 100644
index f9429debc593..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayCertificateAuthorityCreatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayCertificateAuthorityCreatedEventData IJsonModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayCertificateAuthorityCreatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayCertificateAuthorityCreatedEventData DeserializeApiManagementGatewayCertificateAuthorityCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayCertificateAuthorityCreatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayCertificateAuthorityCreatedEventData IPersistableModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayCertificateAuthorityCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayCertificateAuthorityCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayCertificateAuthorityCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayCertificateAuthorityCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityCreatedEventData.cs
deleted file mode 100644
index 32b7e53f6027..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityCreatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayCertificateAuthorityCreated event. </summary>
-    public partial class ApiManagementGatewayCertificateAuthorityCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayCertificateAuthorityCreatedEventData"/>. </summary>
-        internal ApiManagementGatewayCertificateAuthorityCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayCertificateAuthorityCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayCertificateAuthorityCreatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityDeletedEventData.Serialization.cs
deleted file mode 100644
index 7209c9da9043..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayCertificateAuthorityDeletedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayCertificateAuthorityDeletedEventData IJsonModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayCertificateAuthorityDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayCertificateAuthorityDeletedEventData DeserializeApiManagementGatewayCertificateAuthorityDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayCertificateAuthorityDeletedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayCertificateAuthorityDeletedEventData IPersistableModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayCertificateAuthorityDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayCertificateAuthorityDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayCertificateAuthorityDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayCertificateAuthorityDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityDeletedEventData.cs
deleted file mode 100644
index dab4e404a22c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityDeletedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayCertificateAuthorityDeleted event. </summary>
-    public partial class ApiManagementGatewayCertificateAuthorityDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayCertificateAuthorityDeletedEventData"/>. </summary>
-        internal ApiManagementGatewayCertificateAuthorityDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayCertificateAuthorityDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayCertificateAuthorityDeletedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityUpdatedEventData.Serialization.cs
deleted file mode 100644
index f0d7e939da8c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayCertificateAuthorityUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayCertificateAuthorityUpdatedEventData IJsonModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayCertificateAuthorityUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayCertificateAuthorityUpdatedEventData DeserializeApiManagementGatewayCertificateAuthorityUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayCertificateAuthorityUpdatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayCertificateAuthorityUpdatedEventData IPersistableModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayCertificateAuthorityUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayCertificateAuthorityUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayCertificateAuthorityUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayCertificateAuthorityUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayCertificateAuthorityUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityUpdatedEventData.cs
deleted file mode 100644
index b302731c4cd0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCertificateAuthorityUpdatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayCertificateAuthorityUpdated event. </summary>
-    public partial class ApiManagementGatewayCertificateAuthorityUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayCertificateAuthorityUpdatedEventData"/>. </summary>
-        internal ApiManagementGatewayCertificateAuthorityUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayCertificateAuthorityUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayCertificateAuthorityUpdatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCreatedEventData.Serialization.cs
deleted file mode 100644
index bf6bf9bf82e8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayCreatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayCreatedEventData IJsonModel<ApiManagementGatewayCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayCreatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayCreatedEventData DeserializeApiManagementGatewayCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayCreatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayCreatedEventData IPersistableModel<ApiManagementGatewayCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCreatedEventData.cs
deleted file mode 100644
index b28dcba9ca70..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayCreatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayCreated event. </summary>
-    public partial class ApiManagementGatewayCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayCreatedEventData"/>. </summary>
-        internal ApiManagementGatewayCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayCreatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayDeletedEventData.Serialization.cs
deleted file mode 100644
index 1c4c03f55956..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayDeletedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayDeletedEventData IJsonModel<ApiManagementGatewayDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayDeletedEventData DeserializeApiManagementGatewayDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayDeletedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayDeletedEventData IPersistableModel<ApiManagementGatewayDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayDeletedEventData.cs
deleted file mode 100644
index 5918a4eec077..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayDeletedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayDeleted event. </summary>
-    public partial class ApiManagementGatewayDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayDeletedEventData"/>. </summary>
-        internal ApiManagementGatewayDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayDeletedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationCreatedEventData.Serialization.cs
deleted file mode 100644
index 8f5e8fae4a35..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayHostnameConfigurationCreatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayHostnameConfigurationCreatedEventData IJsonModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayHostnameConfigurationCreatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayHostnameConfigurationCreatedEventData DeserializeApiManagementGatewayHostnameConfigurationCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayHostnameConfigurationCreatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayHostnameConfigurationCreatedEventData IPersistableModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayHostnameConfigurationCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayHostnameConfigurationCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayHostnameConfigurationCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayHostnameConfigurationCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationCreatedEventData.cs
deleted file mode 100644
index dd89003f1941..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationCreatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayHostnameConfigurationCreated event. </summary>
-    public partial class ApiManagementGatewayHostnameConfigurationCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayHostnameConfigurationCreatedEventData"/>. </summary>
-        internal ApiManagementGatewayHostnameConfigurationCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayHostnameConfigurationCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayHostnameConfigurationCreatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationDeletedEventData.Serialization.cs
deleted file mode 100644
index 2a65de8c566b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayHostnameConfigurationDeletedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayHostnameConfigurationDeletedEventData IJsonModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayHostnameConfigurationDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayHostnameConfigurationDeletedEventData DeserializeApiManagementGatewayHostnameConfigurationDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayHostnameConfigurationDeletedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayHostnameConfigurationDeletedEventData IPersistableModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayHostnameConfigurationDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayHostnameConfigurationDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayHostnameConfigurationDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayHostnameConfigurationDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationDeletedEventData.cs
deleted file mode 100644
index fe117060adce..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationDeletedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayHostnameConfigurationDeleted event. </summary>
-    public partial class ApiManagementGatewayHostnameConfigurationDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayHostnameConfigurationDeletedEventData"/>. </summary>
-        internal ApiManagementGatewayHostnameConfigurationDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayHostnameConfigurationDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayHostnameConfigurationDeletedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationUpdatedEventData.Serialization.cs
deleted file mode 100644
index b97060c07e9f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayHostnameConfigurationUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayHostnameConfigurationUpdatedEventData IJsonModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayHostnameConfigurationUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayHostnameConfigurationUpdatedEventData DeserializeApiManagementGatewayHostnameConfigurationUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayHostnameConfigurationUpdatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayHostnameConfigurationUpdatedEventData IPersistableModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayHostnameConfigurationUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayHostnameConfigurationUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayHostnameConfigurationUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayHostnameConfigurationUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayHostnameConfigurationUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationUpdatedEventData.cs
deleted file mode 100644
index 0dcea1771fde..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayHostnameConfigurationUpdatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayHostnameConfigurationUpdated event. </summary>
-    public partial class ApiManagementGatewayHostnameConfigurationUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayHostnameConfigurationUpdatedEventData"/>. </summary>
-        internal ApiManagementGatewayHostnameConfigurationUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayHostnameConfigurationUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayHostnameConfigurationUpdatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayUpdatedEventData.Serialization.cs
deleted file mode 100644
index 12106bcdb3a5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementGatewayUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementGatewayUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementGatewayUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementGatewayUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementGatewayUpdatedEventData IJsonModel<ApiManagementGatewayUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementGatewayUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementGatewayUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementGatewayUpdatedEventData DeserializeApiManagementGatewayUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementGatewayUpdatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementGatewayUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementGatewayUpdatedEventData IPersistableModel<ApiManagementGatewayUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementGatewayUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementGatewayUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementGatewayUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementGatewayUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementGatewayUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementGatewayUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayUpdatedEventData.cs
deleted file mode 100644
index dc3cc4137431..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementGatewayUpdatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.GatewayUpdated event. </summary>
-    public partial class ApiManagementGatewayUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayUpdatedEventData"/>. </summary>
-        internal ApiManagementGatewayUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementGatewayUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementGatewayUpdatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductCreatedEventData.Serialization.cs
deleted file mode 100644
index 8370b13bfdc9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementProductCreatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementProductCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementProductCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementProductCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementProductCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementProductCreatedEventData IJsonModel<ApiManagementProductCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementProductCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementProductCreatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementProductCreatedEventData DeserializeApiManagementProductCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementProductCreatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementProductCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementProductCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementProductCreatedEventData IPersistableModel<ApiManagementProductCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementProductCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementProductCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementProductCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementProductCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementProductCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductCreatedEventData.cs
deleted file mode 100644
index d395c9b88db7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductCreatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductCreated event. </summary>
-    public partial class ApiManagementProductCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementProductCreatedEventData"/>. </summary>
-        internal ApiManagementProductCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementProductCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementProductCreatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductDeletedEventData.Serialization.cs
deleted file mode 100644
index 7da867ded040..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementProductDeletedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementProductDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementProductDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementProductDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementProductDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementProductDeletedEventData IJsonModel<ApiManagementProductDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementProductDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementProductDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementProductDeletedEventData DeserializeApiManagementProductDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementProductDeletedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementProductDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementProductDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementProductDeletedEventData IPersistableModel<ApiManagementProductDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementProductDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementProductDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementProductDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementProductDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementProductDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductDeletedEventData.cs
deleted file mode 100644
index 54b5e5c02e30..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductDeletedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductDeleted event. </summary>
-    public partial class ApiManagementProductDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementProductDeletedEventData"/>. </summary>
-        internal ApiManagementProductDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementProductDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementProductDeletedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductUpdatedEventData.Serialization.cs
deleted file mode 100644
index 11ac30448ea3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementProductUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementProductUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementProductUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementProductUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementProductUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementProductUpdatedEventData IJsonModel<ApiManagementProductUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementProductUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementProductUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementProductUpdatedEventData DeserializeApiManagementProductUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementProductUpdatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementProductUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementProductUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementProductUpdatedEventData IPersistableModel<ApiManagementProductUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementProductUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementProductUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementProductUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementProductUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementProductUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementProductUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductUpdatedEventData.cs
deleted file mode 100644
index 336ba37353c3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementProductUpdatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductUpdated event. </summary>
-    public partial class ApiManagementProductUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementProductUpdatedEventData"/>. </summary>
-        internal ApiManagementProductUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementProductUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementProductUpdatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionCreatedEventData.Serialization.cs
deleted file mode 100644
index d1e89813c46a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementSubscriptionCreatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementSubscriptionCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementSubscriptionCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementSubscriptionCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementSubscriptionCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementSubscriptionCreatedEventData IJsonModel<ApiManagementSubscriptionCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementSubscriptionCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementSubscriptionCreatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementSubscriptionCreatedEventData DeserializeApiManagementSubscriptionCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementSubscriptionCreatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementSubscriptionCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementSubscriptionCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementSubscriptionCreatedEventData IPersistableModel<ApiManagementSubscriptionCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementSubscriptionCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementSubscriptionCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementSubscriptionCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementSubscriptionCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementSubscriptionCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionCreatedEventData.cs
deleted file mode 100644
index e7bc42c2ff74..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionCreatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionCreated event. </summary>
-    public partial class ApiManagementSubscriptionCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementSubscriptionCreatedEventData"/>. </summary>
-        internal ApiManagementSubscriptionCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementSubscriptionCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementSubscriptionCreatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionDeletedEventData.Serialization.cs
deleted file mode 100644
index aa09d39871b2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementSubscriptionDeletedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementSubscriptionDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementSubscriptionDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementSubscriptionDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementSubscriptionDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementSubscriptionDeletedEventData IJsonModel<ApiManagementSubscriptionDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementSubscriptionDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementSubscriptionDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementSubscriptionDeletedEventData DeserializeApiManagementSubscriptionDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementSubscriptionDeletedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementSubscriptionDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementSubscriptionDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementSubscriptionDeletedEventData IPersistableModel<ApiManagementSubscriptionDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementSubscriptionDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementSubscriptionDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementSubscriptionDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementSubscriptionDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementSubscriptionDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionDeletedEventData.cs
deleted file mode 100644
index 3cfae7be4246..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionDeletedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionDeleted event. </summary>
-    public partial class ApiManagementSubscriptionDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementSubscriptionDeletedEventData"/>. </summary>
-        internal ApiManagementSubscriptionDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementSubscriptionDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementSubscriptionDeletedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionUpdatedEventData.Serialization.cs
deleted file mode 100644
index 290798ec0562..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementSubscriptionUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementSubscriptionUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementSubscriptionUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementSubscriptionUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementSubscriptionUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementSubscriptionUpdatedEventData IJsonModel<ApiManagementSubscriptionUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementSubscriptionUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementSubscriptionUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementSubscriptionUpdatedEventData DeserializeApiManagementSubscriptionUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementSubscriptionUpdatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementSubscriptionUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementSubscriptionUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementSubscriptionUpdatedEventData IPersistableModel<ApiManagementSubscriptionUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementSubscriptionUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementSubscriptionUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementSubscriptionUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementSubscriptionUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementSubscriptionUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementSubscriptionUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionUpdatedEventData.cs
deleted file mode 100644
index 564941c53a12..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementSubscriptionUpdatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionUpdated event. </summary>
-    public partial class ApiManagementSubscriptionUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementSubscriptionUpdatedEventData"/>. </summary>
-        internal ApiManagementSubscriptionUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementSubscriptionUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementSubscriptionUpdatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserCreatedEventData.Serialization.cs
deleted file mode 100644
index 7700a92dd618..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementUserCreatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementUserCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementUserCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementUserCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementUserCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementUserCreatedEventData IJsonModel<ApiManagementUserCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementUserCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementUserCreatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementUserCreatedEventData DeserializeApiManagementUserCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementUserCreatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementUserCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementUserCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementUserCreatedEventData IPersistableModel<ApiManagementUserCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementUserCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementUserCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementUserCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementUserCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementUserCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserCreatedEventData.cs
deleted file mode 100644
index 5d7803964784..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserCreatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserCreated event. </summary>
-    public partial class ApiManagementUserCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementUserCreatedEventData"/>. </summary>
-        internal ApiManagementUserCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementUserCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementUserCreatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserDeletedEventData.Serialization.cs
deleted file mode 100644
index 997b13aa9d49..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementUserDeletedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementUserDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementUserDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementUserDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementUserDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementUserDeletedEventData IJsonModel<ApiManagementUserDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementUserDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementUserDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementUserDeletedEventData DeserializeApiManagementUserDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementUserDeletedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementUserDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementUserDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementUserDeletedEventData IPersistableModel<ApiManagementUserDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementUserDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementUserDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementUserDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementUserDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementUserDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserDeletedEventData.cs
deleted file mode 100644
index 46e4e68a77fa..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserDeletedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserDeleted event. </summary>
-    public partial class ApiManagementUserDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementUserDeletedEventData"/>. </summary>
-        internal ApiManagementUserDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementUserDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementUserDeletedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserUpdatedEventData.Serialization.cs
deleted file mode 100644
index aefcba2c8c70..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ApiManagementUserUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ApiManagementUserUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ApiManagementUserUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ApiManagementUserUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementUserUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ApiManagementUserUpdatedEventData IJsonModel<ApiManagementUserUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ApiManagementUserUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeApiManagementUserUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ApiManagementUserUpdatedEventData DeserializeApiManagementUserUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string resourceUri = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ApiManagementUserUpdatedEventData(resourceUri, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ApiManagementUserUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementUserUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ApiManagementUserUpdatedEventData IPersistableModel<ApiManagementUserUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ApiManagementUserUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeApiManagementUserUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ApiManagementUserUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ApiManagementUserUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ApiManagementUserUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeApiManagementUserUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserUpdatedEventData.cs
deleted file mode 100644
index 07bdfb4686e3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ApiManagementUserUpdatedEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserUpdated event. </summary>
-    public partial class ApiManagementUserUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementUserUpdatedEventData"/>. </summary>
-        internal ApiManagementUserUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ApiManagementUserUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ApiManagementUserUpdatedEventData(string resourceUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceUri = resourceUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </summary>
-        public string ResourceUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppAction.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppAction.cs
deleted file mode 100644
index e360f1f1c2eb..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppAction.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Type of action of the operation. </summary>
-    public readonly partial struct AppAction : IEquatable<AppAction>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AppAction"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AppAction(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string RestartedValue = "Restarted";
-        private const string StoppedValue = "Stopped";
-        private const string ChangedAppSettingsValue = "ChangedAppSettings";
-        private const string StartedValue = "Started";
-        private const string CompletedValue = "Completed";
-        private const string FailedValue = "Failed";
-
-        /// <summary> Web app was restarted. </summary>
-        public static AppAction Restarted { get; } = new AppAction(RestartedValue);
-        /// <summary> Web app was stopped. </summary>
-        public static AppAction Stopped { get; } = new AppAction(StoppedValue);
-        /// <summary> There was an operation to change app setting on the web app. </summary>
-        public static AppAction ChangedAppSettings { get; } = new AppAction(ChangedAppSettingsValue);
-        /// <summary> The job has started. </summary>
-        public static AppAction Started { get; } = new AppAction(StartedValue);
-        /// <summary> The job has completed. </summary>
-        public static AppAction Completed { get; } = new AppAction(CompletedValue);
-        /// <summary> The job has failed to complete. </summary>
-        public static AppAction Failed { get; } = new AppAction(FailedValue);
-        /// <summary> Determines if two <see cref="AppAction"/> values are the same. </summary>
-        public static bool operator ==(AppAction left, AppAction right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AppAction"/> values are not the same. </summary>
-        public static bool operator !=(AppAction left, AppAction right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AppAction"/>. </summary>
-        public static implicit operator AppAction(string value) => new AppAction(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AppAction other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AppAction other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.Serialization.cs
deleted file mode 100644
index d02ce8908a3f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AppConfigurationKeyValueDeletedEventData : IUtf8JsonSerializable, IJsonModel<AppConfigurationKeyValueDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AppConfigurationKeyValueDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AppConfigurationKeyValueDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationKeyValueDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationKeyValueDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Key))
-            {
-                writer.WritePropertyName("key"u8);
-                writer.WriteStringValue(Key);
-            }
-            if (Optional.IsDefined(Label))
-            {
-                writer.WritePropertyName("label"u8);
-                writer.WriteStringValue(Label);
-            }
-            if (Optional.IsDefined(Etag))
-            {
-                writer.WritePropertyName("etag"u8);
-                writer.WriteStringValue(Etag);
-            }
-            if (Optional.IsDefined(SyncToken))
-            {
-                writer.WritePropertyName("syncToken"u8);
-                writer.WriteStringValue(SyncToken);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AppConfigurationKeyValueDeletedEventData IJsonModel<AppConfigurationKeyValueDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationKeyValueDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationKeyValueDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAppConfigurationKeyValueDeletedEventData(document.RootElement, options);
-        }
-
-        internal static AppConfigurationKeyValueDeletedEventData DeserializeAppConfigurationKeyValueDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string key = default;
-            string label = default;
-            string etag = default;
-            string syncToken = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("key"u8))
-                {
-                    key = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("label"u8))
-                {
-                    label = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("etag"u8))
-                {
-                    etag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("syncToken"u8))
-                {
-                    syncToken = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AppConfigurationKeyValueDeletedEventData(key, label, etag, syncToken, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AppConfigurationKeyValueDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationKeyValueDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationKeyValueDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AppConfigurationKeyValueDeletedEventData IPersistableModel<AppConfigurationKeyValueDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationKeyValueDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAppConfigurationKeyValueDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationKeyValueDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AppConfigurationKeyValueDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AppConfigurationKeyValueDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAppConfigurationKeyValueDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.cs
deleted file mode 100644
index b920a0b33dd2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.cs
+++ /dev/null
@@ -1,77 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AppConfiguration.KeyValueDeleted event. </summary>
-    public partial class AppConfigurationKeyValueDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueDeletedEventData"/>. </summary>
-        internal AppConfigurationKeyValueDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueDeletedEventData"/>. </summary>
-        /// <param name="key"> The key used to identify the key-value that was deleted. </param>
-        /// <param name="label"> The label, if any, used to identify the key-value that was deleted. </param>
-        /// <param name="etag"> The etag representing the key-value that was deleted. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AppConfigurationKeyValueDeletedEventData(string key, string label, string etag, string syncToken, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Key = key;
-            Label = label;
-            Etag = etag;
-            SyncToken = syncToken;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The key used to identify the key-value that was deleted. </summary>
-        public string Key { get; }
-        /// <summary> The label, if any, used to identify the key-value that was deleted. </summary>
-        public string Label { get; }
-        /// <summary> The etag representing the key-value that was deleted. </summary>
-        public string Etag { get; }
-        /// <summary> The sync token representing the server state after the event. </summary>
-        public string SyncToken { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.Serialization.cs
deleted file mode 100644
index 73f91a283b8c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AppConfigurationKeyValueModifiedEventData : IUtf8JsonSerializable, IJsonModel<AppConfigurationKeyValueModifiedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AppConfigurationKeyValueModifiedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AppConfigurationKeyValueModifiedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationKeyValueModifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationKeyValueModifiedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Key))
-            {
-                writer.WritePropertyName("key"u8);
-                writer.WriteStringValue(Key);
-            }
-            if (Optional.IsDefined(Label))
-            {
-                writer.WritePropertyName("label"u8);
-                writer.WriteStringValue(Label);
-            }
-            if (Optional.IsDefined(Etag))
-            {
-                writer.WritePropertyName("etag"u8);
-                writer.WriteStringValue(Etag);
-            }
-            if (Optional.IsDefined(SyncToken))
-            {
-                writer.WritePropertyName("syncToken"u8);
-                writer.WriteStringValue(SyncToken);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AppConfigurationKeyValueModifiedEventData IJsonModel<AppConfigurationKeyValueModifiedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationKeyValueModifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationKeyValueModifiedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAppConfigurationKeyValueModifiedEventData(document.RootElement, options);
-        }
-
-        internal static AppConfigurationKeyValueModifiedEventData DeserializeAppConfigurationKeyValueModifiedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string key = default;
-            string label = default;
-            string etag = default;
-            string syncToken = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("key"u8))
-                {
-                    key = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("label"u8))
-                {
-                    label = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("etag"u8))
-                {
-                    etag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("syncToken"u8))
-                {
-                    syncToken = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AppConfigurationKeyValueModifiedEventData(key, label, etag, syncToken, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AppConfigurationKeyValueModifiedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationKeyValueModifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationKeyValueModifiedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AppConfigurationKeyValueModifiedEventData IPersistableModel<AppConfigurationKeyValueModifiedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationKeyValueModifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAppConfigurationKeyValueModifiedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationKeyValueModifiedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AppConfigurationKeyValueModifiedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AppConfigurationKeyValueModifiedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAppConfigurationKeyValueModifiedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.cs
deleted file mode 100644
index e03cb8ded63b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.cs
+++ /dev/null
@@ -1,77 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AppConfiguration.KeyValueModified event. </summary>
-    public partial class AppConfigurationKeyValueModifiedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueModifiedEventData"/>. </summary>
-        internal AppConfigurationKeyValueModifiedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueModifiedEventData"/>. </summary>
-        /// <param name="key"> The key used to identify the key-value that was modified. </param>
-        /// <param name="label"> The label, if any, used to identify the key-value that was modified. </param>
-        /// <param name="etag"> The etag representing the new state of the key-value. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AppConfigurationKeyValueModifiedEventData(string key, string label, string etag, string syncToken, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Key = key;
-            Label = label;
-            Etag = etag;
-            SyncToken = syncToken;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The key used to identify the key-value that was modified. </summary>
-        public string Key { get; }
-        /// <summary> The label, if any, used to identify the key-value that was modified. </summary>
-        public string Label { get; }
-        /// <summary> The etag representing the new state of the key-value. </summary>
-        public string Etag { get; }
-        /// <summary> The sync token representing the server state after the event. </summary>
-        public string SyncToken { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.Serialization.cs
deleted file mode 100644
index f5af7a38bbc8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AppConfigurationSnapshotCreatedEventData : IUtf8JsonSerializable, IJsonModel<AppConfigurationSnapshotCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AppConfigurationSnapshotCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AppConfigurationSnapshotCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationSnapshotCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AppConfigurationSnapshotCreatedEventData IJsonModel<AppConfigurationSnapshotCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationSnapshotCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAppConfigurationSnapshotCreatedEventData(document.RootElement, options);
-        }
-
-        internal static AppConfigurationSnapshotCreatedEventData DeserializeAppConfigurationSnapshotCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            string etag = default;
-            string syncToken = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("etag"u8))
-                {
-                    etag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("syncToken"u8))
-                {
-                    syncToken = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AppConfigurationSnapshotCreatedEventData(name, etag, syncToken, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AppConfigurationSnapshotCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationSnapshotCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AppConfigurationSnapshotCreatedEventData IPersistableModel<AppConfigurationSnapshotCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAppConfigurationSnapshotCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationSnapshotCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AppConfigurationSnapshotCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AppConfigurationSnapshotCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAppConfigurationSnapshotCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.cs
deleted file mode 100644
index 319beef466ce..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.cs
+++ /dev/null
@@ -1,30 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AppConfiguration.SnapshotCreated event. </summary>
-    public partial class AppConfigurationSnapshotCreatedEventData : AppConfigurationSnapshotEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotCreatedEventData"/>. </summary>
-        internal AppConfigurationSnapshotCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotCreatedEventData"/>. </summary>
-        /// <param name="name"> The name of the snapshot. </param>
-        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AppConfigurationSnapshotCreatedEventData(string name, string etag, string syncToken, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(name, etag, syncToken, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.Serialization.cs
deleted file mode 100644
index 540ed46bcbaf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AppConfigurationSnapshotEventData : IUtf8JsonSerializable, IJsonModel<AppConfigurationSnapshotEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AppConfigurationSnapshotEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AppConfigurationSnapshotEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationSnapshotEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Etag))
-            {
-                writer.WritePropertyName("etag"u8);
-                writer.WriteStringValue(Etag);
-            }
-            if (Optional.IsDefined(SyncToken))
-            {
-                writer.WritePropertyName("syncToken"u8);
-                writer.WriteStringValue(SyncToken);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AppConfigurationSnapshotEventData IJsonModel<AppConfigurationSnapshotEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationSnapshotEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAppConfigurationSnapshotEventData(document.RootElement, options);
-        }
-
-        internal static AppConfigurationSnapshotEventData DeserializeAppConfigurationSnapshotEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            string etag = default;
-            string syncToken = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("etag"u8))
-                {
-                    etag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("syncToken"u8))
-                {
-                    syncToken = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AppConfigurationSnapshotEventData(name, etag, syncToken, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AppConfigurationSnapshotEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationSnapshotEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AppConfigurationSnapshotEventData IPersistableModel<AppConfigurationSnapshotEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAppConfigurationSnapshotEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationSnapshotEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AppConfigurationSnapshotEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AppConfigurationSnapshotEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAppConfigurationSnapshotEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.cs
deleted file mode 100644
index a64d0e66a4fc..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.cs
+++ /dev/null
@@ -1,73 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of snapshot events. </summary>
-    public partial class AppConfigurationSnapshotEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotEventData"/>. </summary>
-        internal AppConfigurationSnapshotEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotEventData"/>. </summary>
-        /// <param name="name"> The name of the snapshot. </param>
-        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AppConfigurationSnapshotEventData(string name, string etag, string syncToken, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Name = name;
-            Etag = etag;
-            SyncToken = syncToken;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The name of the snapshot. </summary>
-        public string Name { get; }
-        /// <summary> The etag representing the new state of the snapshot. </summary>
-        public string Etag { get; }
-        /// <summary> The sync token representing the server state after the event. </summary>
-        public string SyncToken { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.Serialization.cs
deleted file mode 100644
index c787e6e2197c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.Serialization.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AppConfigurationSnapshotModifiedEventData : IUtf8JsonSerializable, IJsonModel<AppConfigurationSnapshotModifiedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AppConfigurationSnapshotModifiedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AppConfigurationSnapshotModifiedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotModifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationSnapshotModifiedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AppConfigurationSnapshotModifiedEventData IJsonModel<AppConfigurationSnapshotModifiedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotModifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppConfigurationSnapshotModifiedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAppConfigurationSnapshotModifiedEventData(document.RootElement, options);
-        }
-
-        internal static AppConfigurationSnapshotModifiedEventData DeserializeAppConfigurationSnapshotModifiedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            string etag = default;
-            string syncToken = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("etag"u8))
-                {
-                    etag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("syncToken"u8))
-                {
-                    syncToken = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AppConfigurationSnapshotModifiedEventData(name, etag, syncToken, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AppConfigurationSnapshotModifiedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotModifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationSnapshotModifiedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AppConfigurationSnapshotModifiedEventData IPersistableModel<AppConfigurationSnapshotModifiedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppConfigurationSnapshotModifiedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAppConfigurationSnapshotModifiedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AppConfigurationSnapshotModifiedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AppConfigurationSnapshotModifiedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AppConfigurationSnapshotModifiedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAppConfigurationSnapshotModifiedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.cs
deleted file mode 100644
index cd89dfdb11d1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.cs
+++ /dev/null
@@ -1,30 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AppConfiguration.SnapshotModified event. </summary>
-    public partial class AppConfigurationSnapshotModifiedEventData : AppConfigurationSnapshotEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotModifiedEventData"/>. </summary>
-        internal AppConfigurationSnapshotModifiedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotModifiedEventData"/>. </summary>
-        /// <param name="name"> The name of the snapshot. </param>
-        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AppConfigurationSnapshotModifiedEventData(string name, string etag, string syncToken, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(name, etag, syncToken, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppEventTypeDetail.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppEventTypeDetail.Serialization.cs
deleted file mode 100644
index fb9093c7757e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppEventTypeDetail.Serialization.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AppEventTypeDetail : IUtf8JsonSerializable, IJsonModel<AppEventTypeDetail>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AppEventTypeDetail>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AppEventTypeDetail>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppEventTypeDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppEventTypeDetail)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("action"u8);
-            writer.WriteStringValue(Action.ToString());
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AppEventTypeDetail IJsonModel<AppEventTypeDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppEventTypeDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppEventTypeDetail)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAppEventTypeDetail(document.RootElement, options);
-        }
-
-        internal static AppEventTypeDetail DeserializeAppEventTypeDetail(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppAction action = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("action"u8))
-                {
-                    action = new AppAction(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AppEventTypeDetail(action, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AppEventTypeDetail>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppEventTypeDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AppEventTypeDetail)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AppEventTypeDetail IPersistableModel<AppEventTypeDetail>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppEventTypeDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAppEventTypeDetail(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AppEventTypeDetail)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AppEventTypeDetail>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AppEventTypeDetail FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAppEventTypeDetail(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppEventTypeDetail.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppEventTypeDetail.cs
deleted file mode 100644
index 43550772de8f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppEventTypeDetail.cs
+++ /dev/null
@@ -1,72 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Detail of action on the app. </summary>
-    public partial class AppEventTypeDetail
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AppEventTypeDetail"/>. </summary>
-        /// <param name="action"> Type of action of the operation. </param>
-        internal AppEventTypeDetail(AppAction action)
-        {
-            Action = action;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppEventTypeDetail"/>. </summary>
-        /// <param name="action"> Type of action of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AppEventTypeDetail(AppAction action, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Action = action;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppEventTypeDetail"/> for deserialization. </summary>
-        internal AppEventTypeDetail()
-        {
-        }
-
-        /// <summary> Type of action of the operation. </summary>
-        public AppAction Action { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanAction.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanAction.cs
deleted file mode 100644
index 50794cff196b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanAction.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Type of action on the app service plan. </summary>
-    public readonly partial struct AppServicePlanAction : IEquatable<AppServicePlanAction>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AppServicePlanAction"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AppServicePlanAction(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string UpdatedValue = "Updated";
-
-        /// <summary> App Service plan is being updated. </summary>
-        public static AppServicePlanAction Updated { get; } = new AppServicePlanAction(UpdatedValue);
-        /// <summary> Determines if two <see cref="AppServicePlanAction"/> values are the same. </summary>
-        public static bool operator ==(AppServicePlanAction left, AppServicePlanAction right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AppServicePlanAction"/> values are not the same. </summary>
-        public static bool operator !=(AppServicePlanAction left, AppServicePlanAction right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AppServicePlanAction"/>. </summary>
-        public static implicit operator AppServicePlanAction(string value) => new AppServicePlanAction(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AppServicePlanAction other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AppServicePlanAction other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanEventTypeDetail.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanEventTypeDetail.Serialization.cs
deleted file mode 100644
index af722568a779..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanEventTypeDetail.Serialization.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AppServicePlanEventTypeDetail : IUtf8JsonSerializable, IJsonModel<AppServicePlanEventTypeDetail>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AppServicePlanEventTypeDetail>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AppServicePlanEventTypeDetail>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppServicePlanEventTypeDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppServicePlanEventTypeDetail)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("stampKind"u8);
-            writer.WriteStringValue(StampKind.ToString());
-            writer.WritePropertyName("action"u8);
-            writer.WriteStringValue(Action.ToString());
-            writer.WritePropertyName("status"u8);
-            writer.WriteStringValue(Status.ToString());
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AppServicePlanEventTypeDetail IJsonModel<AppServicePlanEventTypeDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppServicePlanEventTypeDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AppServicePlanEventTypeDetail)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAppServicePlanEventTypeDetail(document.RootElement, options);
-        }
-
-        internal static AppServicePlanEventTypeDetail DeserializeAppServicePlanEventTypeDetail(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            StampKind stampKind = default;
-            AppServicePlanAction action = default;
-            AsyncStatus status = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("stampKind"u8))
-                {
-                    stampKind = new StampKind(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("action"u8))
-                {
-                    action = new AppServicePlanAction(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = new AsyncStatus(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AppServicePlanEventTypeDetail(stampKind, action, status, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AppServicePlanEventTypeDetail>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppServicePlanEventTypeDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AppServicePlanEventTypeDetail)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AppServicePlanEventTypeDetail IPersistableModel<AppServicePlanEventTypeDetail>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AppServicePlanEventTypeDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAppServicePlanEventTypeDetail(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AppServicePlanEventTypeDetail)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AppServicePlanEventTypeDetail>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AppServicePlanEventTypeDetail FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAppServicePlanEventTypeDetail(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanEventTypeDetail.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanEventTypeDetail.cs
deleted file mode 100644
index f4c61633045b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppServicePlanEventTypeDetail.cs
+++ /dev/null
@@ -1,84 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Detail of action on the app service plan. </summary>
-    public partial class AppServicePlanEventTypeDetail
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AppServicePlanEventTypeDetail"/>. </summary>
-        /// <param name="stampKind"> Kind of environment where app service plan is. </param>
-        /// <param name="action"> Type of action on the app service plan. </param>
-        /// <param name="status"> Asynchronous operation status of the operation on the app service plan. </param>
-        internal AppServicePlanEventTypeDetail(StampKind stampKind, AppServicePlanAction action, AsyncStatus status)
-        {
-            StampKind = stampKind;
-            Action = action;
-            Status = status;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppServicePlanEventTypeDetail"/>. </summary>
-        /// <param name="stampKind"> Kind of environment where app service plan is. </param>
-        /// <param name="action"> Type of action on the app service plan. </param>
-        /// <param name="status"> Asynchronous operation status of the operation on the app service plan. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AppServicePlanEventTypeDetail(StampKind stampKind, AppServicePlanAction action, AsyncStatus status, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            StampKind = stampKind;
-            Action = action;
-            Status = status;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AppServicePlanEventTypeDetail"/> for deserialization. </summary>
-        internal AppServicePlanEventTypeDetail()
-        {
-        }
-
-        /// <summary> Kind of environment where app service plan is. </summary>
-        public StampKind StampKind { get; }
-        /// <summary> Type of action on the app service plan. </summary>
-        public AppServicePlanAction Action { get; }
-        /// <summary> Asynchronous operation status of the operation on the app service plan. </summary>
-        public AsyncStatus Status { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AsyncStatus.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AsyncStatus.cs
deleted file mode 100644
index bde75225c10a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AsyncStatus.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Asynchronous operation status of the operation on the app service plan. </summary>
-    public readonly partial struct AsyncStatus : IEquatable<AsyncStatus>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="AsyncStatus"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AsyncStatus(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string StartedValue = "Started";
-        private const string CompletedValue = "Completed";
-        private const string FailedValue = "Failed";
-
-        /// <summary> Async operation has started. </summary>
-        public static AsyncStatus Started { get; } = new AsyncStatus(StartedValue);
-        /// <summary> Async operation has completed. </summary>
-        public static AsyncStatus Completed { get; } = new AsyncStatus(CompletedValue);
-        /// <summary> Async operation failed to complete. </summary>
-        public static AsyncStatus Failed { get; } = new AsyncStatus(FailedValue);
-        /// <summary> Determines if two <see cref="AsyncStatus"/> values are the same. </summary>
-        public static bool operator ==(AsyncStatus left, AsyncStatus right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="AsyncStatus"/> values are not the same. </summary>
-        public static bool operator !=(AsyncStatus left, AsyncStatus right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AsyncStatus"/>. </summary>
-        public static implicit operator AsyncStatus(string value) => new AsyncStatus(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AsyncStatus other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(AsyncStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterCreatedEventData.Serialization.cs
deleted file mode 100644
index 55b8f25b0e9e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsClusterCreatedEventData : IUtf8JsonSerializable, IJsonModel<AvsClusterCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsClusterCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsClusterCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AvsClusterCreatedEventData IJsonModel<AvsClusterCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsClusterCreatedEventData(document.RootElement, options);
-        }
-
-        internal static AvsClusterCreatedEventData DeserializeAvsClusterCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            IReadOnlyList<string> addedHostNames = default;
-            IReadOnlyList<string> removedHostNames = default;
-            IReadOnlyList<string> inMaintenanceHostNames = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("addedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    addedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("removedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    removedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("inMaintenanceHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    inMaintenanceHostNames = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsClusterCreatedEventData(operationId, addedHostNames ?? new ChangeTrackingList<string>(), removedHostNames ?? new ChangeTrackingList<string>(), inMaintenanceHostNames ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsClusterCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsClusterCreatedEventData IPersistableModel<AvsClusterCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsClusterCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsClusterCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsClusterCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsClusterCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterCreatedEventData.cs
deleted file mode 100644
index 46bc8cc4d87a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterCreatedEventData.cs
+++ /dev/null
@@ -1,31 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ClusterCreated event. </summary>
-    public partial class AvsClusterCreatedEventData : AvsClusterEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsClusterCreatedEventData"/>. </summary>
-        internal AvsClusterCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsClusterCreatedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsClusterCreatedEventData(string operationId, IReadOnlyList<string> addedHostNames, IReadOnlyList<string> removedHostNames, IReadOnlyList<string> inMaintenanceHostNames, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(operationId, addedHostNames, removedHostNames, inMaintenanceHostNames, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterDeletedEventData.Serialization.cs
deleted file mode 100644
index 125230ad0867..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsClusterDeletedEventData : IUtf8JsonSerializable, IJsonModel<AvsClusterDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsClusterDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsClusterDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AvsClusterDeletedEventData IJsonModel<AvsClusterDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsClusterDeletedEventData(document.RootElement, options);
-        }
-
-        internal static AvsClusterDeletedEventData DeserializeAvsClusterDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            IReadOnlyList<string> addedHostNames = default;
-            IReadOnlyList<string> removedHostNames = default;
-            IReadOnlyList<string> inMaintenanceHostNames = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("addedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    addedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("removedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    removedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("inMaintenanceHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    inMaintenanceHostNames = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsClusterDeletedEventData(operationId, addedHostNames ?? new ChangeTrackingList<string>(), removedHostNames ?? new ChangeTrackingList<string>(), inMaintenanceHostNames ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsClusterDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsClusterDeletedEventData IPersistableModel<AvsClusterDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsClusterDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsClusterDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsClusterDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsClusterDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterDeletedEventData.cs
deleted file mode 100644
index 9dc7f3790647..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterDeletedEventData.cs
+++ /dev/null
@@ -1,31 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ClusterDeleted event. </summary>
-    public partial class AvsClusterDeletedEventData : AvsClusterEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsClusterDeletedEventData"/>. </summary>
-        internal AvsClusterDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsClusterDeletedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsClusterDeletedEventData(string operationId, IReadOnlyList<string> addedHostNames, IReadOnlyList<string> removedHostNames, IReadOnlyList<string> inMaintenanceHostNames, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(operationId, addedHostNames, removedHostNames, inMaintenanceHostNames, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterEventData.Serialization.cs
deleted file mode 100644
index 3b0b93de6011..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterEventData.Serialization.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsClusterEventData : IUtf8JsonSerializable, IJsonModel<AvsClusterEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsClusterEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsClusterEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(OperationId))
-            {
-                writer.WritePropertyName("operationId"u8);
-                writer.WriteStringValue(OperationId);
-            }
-            if (Optional.IsCollectionDefined(AddedHostNames))
-            {
-                writer.WritePropertyName("addedHostNames"u8);
-                writer.WriteStartArray();
-                foreach (var item in AddedHostNames)
-                {
-                    writer.WriteStringValue(item);
-                }
-                writer.WriteEndArray();
-            }
-            if (Optional.IsCollectionDefined(RemovedHostNames))
-            {
-                writer.WritePropertyName("removedHostNames"u8);
-                writer.WriteStartArray();
-                foreach (var item in RemovedHostNames)
-                {
-                    writer.WriteStringValue(item);
-                }
-                writer.WriteEndArray();
-            }
-            if (Optional.IsCollectionDefined(InMaintenanceHostNames))
-            {
-                writer.WritePropertyName("inMaintenanceHostNames"u8);
-                writer.WriteStartArray();
-                foreach (var item in InMaintenanceHostNames)
-                {
-                    writer.WriteStringValue(item);
-                }
-                writer.WriteEndArray();
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AvsClusterEventData IJsonModel<AvsClusterEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsClusterEventData(document.RootElement, options);
-        }
-
-        internal static AvsClusterEventData DeserializeAvsClusterEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            IReadOnlyList<string> addedHostNames = default;
-            IReadOnlyList<string> removedHostNames = default;
-            IReadOnlyList<string> inMaintenanceHostNames = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("addedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    addedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("removedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    removedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("inMaintenanceHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    inMaintenanceHostNames = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsClusterEventData(operationId, addedHostNames ?? new ChangeTrackingList<string>(), removedHostNames ?? new ChangeTrackingList<string>(), inMaintenanceHostNames ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsClusterEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsClusterEventData IPersistableModel<AvsClusterEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsClusterEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsClusterEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AvsClusterEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsClusterEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterEventData.cs
deleted file mode 100644
index 4eef16191dbf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterEventData.cs
+++ /dev/null
@@ -1,80 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for Microsoft.AVS/clusters events. </summary>
-    public partial class AvsClusterEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AvsClusterEventData"/>. </summary>
-        internal AvsClusterEventData()
-        {
-            AddedHostNames = new ChangeTrackingList<string>();
-            RemovedHostNames = new ChangeTrackingList<string>();
-            InMaintenanceHostNames = new ChangeTrackingList<string>();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsClusterEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsClusterEventData(string operationId, IReadOnlyList<string> addedHostNames, IReadOnlyList<string> removedHostNames, IReadOnlyList<string> inMaintenanceHostNames, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            OperationId = operationId;
-            AddedHostNames = addedHostNames;
-            RemovedHostNames = removedHostNames;
-            InMaintenanceHostNames = inMaintenanceHostNames;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Id of the operation that caused this event. </summary>
-        public string OperationId { get; }
-        /// <summary> Hosts added to the cluster in this event, if any. </summary>
-        public IReadOnlyList<string> AddedHostNames { get; }
-        /// <summary> Hosts removed from the cluster in this event, if any. </summary>
-        public IReadOnlyList<string> RemovedHostNames { get; }
-        /// <summary> Hosts in Maintenance mode in the cluster, if any. </summary>
-        public IReadOnlyList<string> InMaintenanceHostNames { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterFailedEventData.Serialization.cs
deleted file mode 100644
index 9baf71ab8d87..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsClusterFailedEventData : IUtf8JsonSerializable, IJsonModel<AvsClusterFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsClusterFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsClusterFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(FailureMessage))
-            {
-                writer.WritePropertyName("failureMessage"u8);
-                writer.WriteStringValue(FailureMessage);
-            }
-        }
-
-        AvsClusterFailedEventData IJsonModel<AvsClusterFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsClusterFailedEventData(document.RootElement, options);
-        }
-
-        internal static AvsClusterFailedEventData DeserializeAvsClusterFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string failureMessage = default;
-            string operationId = default;
-            IReadOnlyList<string> addedHostNames = default;
-            IReadOnlyList<string> removedHostNames = default;
-            IReadOnlyList<string> inMaintenanceHostNames = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("failureMessage"u8))
-                {
-                    failureMessage = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("addedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    addedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("removedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    removedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("inMaintenanceHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    inMaintenanceHostNames = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsClusterFailedEventData(
-                operationId,
-                addedHostNames ?? new ChangeTrackingList<string>(),
-                removedHostNames ?? new ChangeTrackingList<string>(),
-                inMaintenanceHostNames ?? new ChangeTrackingList<string>(),
-                serializedAdditionalRawData,
-                failureMessage);
-        }
-
-        BinaryData IPersistableModel<AvsClusterFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsClusterFailedEventData IPersistableModel<AvsClusterFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsClusterFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsClusterFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsClusterFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsClusterFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterFailedEventData.cs
deleted file mode 100644
index 35f0e1353db6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterFailedEventData.cs
+++ /dev/null
@@ -1,36 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ClusterFailed event. </summary>
-    public partial class AvsClusterFailedEventData : AvsClusterEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsClusterFailedEventData"/>. </summary>
-        internal AvsClusterFailedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsClusterFailedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="failureMessage"> Failure reason of an event. </param>
-        internal AvsClusterFailedEventData(string operationId, IReadOnlyList<string> addedHostNames, IReadOnlyList<string> removedHostNames, IReadOnlyList<string> inMaintenanceHostNames, IDictionary<string, BinaryData> serializedAdditionalRawData, string failureMessage) : base(operationId, addedHostNames, removedHostNames, inMaintenanceHostNames, serializedAdditionalRawData)
-        {
-            FailureMessage = failureMessage;
-        }
-
-        /// <summary> Failure reason of an event. </summary>
-        public string FailureMessage { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatedEventData.Serialization.cs
deleted file mode 100644
index 5d6c2758eaab..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsClusterUpdatedEventData : IUtf8JsonSerializable, IJsonModel<AvsClusterUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsClusterUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsClusterUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AvsClusterUpdatedEventData IJsonModel<AvsClusterUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsClusterUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static AvsClusterUpdatedEventData DeserializeAvsClusterUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            IReadOnlyList<string> addedHostNames = default;
-            IReadOnlyList<string> removedHostNames = default;
-            IReadOnlyList<string> inMaintenanceHostNames = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("addedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    addedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("removedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    removedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("inMaintenanceHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    inMaintenanceHostNames = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsClusterUpdatedEventData(operationId, addedHostNames ?? new ChangeTrackingList<string>(), removedHostNames ?? new ChangeTrackingList<string>(), inMaintenanceHostNames ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsClusterUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsClusterUpdatedEventData IPersistableModel<AvsClusterUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsClusterUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsClusterUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsClusterUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsClusterUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatedEventData.cs
deleted file mode 100644
index 7ec6e28e0484..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatedEventData.cs
+++ /dev/null
@@ -1,31 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ClusterUpdated event. </summary>
-    public partial class AvsClusterUpdatedEventData : AvsClusterEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsClusterUpdatedEventData"/>. </summary>
-        internal AvsClusterUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsClusterUpdatedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsClusterUpdatedEventData(string operationId, IReadOnlyList<string> addedHostNames, IReadOnlyList<string> removedHostNames, IReadOnlyList<string> inMaintenanceHostNames, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(operationId, addedHostNames, removedHostNames, inMaintenanceHostNames, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatingEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatingEventData.Serialization.cs
deleted file mode 100644
index abe83f07c523..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatingEventData.Serialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsClusterUpdatingEventData : IUtf8JsonSerializable, IJsonModel<AvsClusterUpdatingEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsClusterUpdatingEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsClusterUpdatingEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterUpdatingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterUpdatingEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AvsClusterUpdatingEventData IJsonModel<AvsClusterUpdatingEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterUpdatingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsClusterUpdatingEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsClusterUpdatingEventData(document.RootElement, options);
-        }
-
-        internal static AvsClusterUpdatingEventData DeserializeAvsClusterUpdatingEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            IReadOnlyList<string> addedHostNames = default;
-            IReadOnlyList<string> removedHostNames = default;
-            IReadOnlyList<string> inMaintenanceHostNames = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("addedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    addedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("removedHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    removedHostNames = array;
-                    continue;
-                }
-                if (property.NameEquals("inMaintenanceHostNames"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    inMaintenanceHostNames = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsClusterUpdatingEventData(operationId, addedHostNames ?? new ChangeTrackingList<string>(), removedHostNames ?? new ChangeTrackingList<string>(), inMaintenanceHostNames ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsClusterUpdatingEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterUpdatingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterUpdatingEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsClusterUpdatingEventData IPersistableModel<AvsClusterUpdatingEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsClusterUpdatingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsClusterUpdatingEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsClusterUpdatingEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsClusterUpdatingEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsClusterUpdatingEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsClusterUpdatingEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatingEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatingEventData.cs
deleted file mode 100644
index 92b2529146e6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsClusterUpdatingEventData.cs
+++ /dev/null
@@ -1,31 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ClusterUpdating event. </summary>
-    public partial class AvsClusterUpdatingEventData : AvsClusterEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsClusterUpdatingEventData"/>. </summary>
-        internal AvsClusterUpdatingEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsClusterUpdatingEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsClusterUpdatingEventData(string operationId, IReadOnlyList<string> addedHostNames, IReadOnlyList<string> removedHostNames, IReadOnlyList<string> inMaintenanceHostNames, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(operationId, addedHostNames, removedHostNames, inMaintenanceHostNames, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudEventData.Serialization.cs
deleted file mode 100644
index 2e7a26a87921..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsPrivateCloudEventData : IUtf8JsonSerializable, IJsonModel<AvsPrivateCloudEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsPrivateCloudEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsPrivateCloudEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsPrivateCloudEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(OperationId))
-            {
-                writer.WritePropertyName("operationId"u8);
-                writer.WriteStringValue(OperationId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AvsPrivateCloudEventData IJsonModel<AvsPrivateCloudEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsPrivateCloudEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsPrivateCloudEventData(document.RootElement, options);
-        }
-
-        internal static AvsPrivateCloudEventData DeserializeAvsPrivateCloudEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsPrivateCloudEventData(operationId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsPrivateCloudEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsPrivateCloudEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsPrivateCloudEventData IPersistableModel<AvsPrivateCloudEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsPrivateCloudEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsPrivateCloudEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsPrivateCloudEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AvsPrivateCloudEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsPrivateCloudEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudEventData.cs
deleted file mode 100644
index 391917dfb4a6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for Microsoft.AVS/privateClouds events. </summary>
-    public partial class AvsPrivateCloudEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AvsPrivateCloudEventData"/>. </summary>
-        internal AvsPrivateCloudEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsPrivateCloudEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsPrivateCloudEventData(string operationId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            OperationId = operationId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Id of the operation that caused this event. </summary>
-        public string OperationId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudFailedEventData.Serialization.cs
deleted file mode 100644
index a958fc84ad61..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsPrivateCloudFailedEventData : IUtf8JsonSerializable, IJsonModel<AvsPrivateCloudFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsPrivateCloudFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsPrivateCloudFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsPrivateCloudFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(FailureMessage))
-            {
-                writer.WritePropertyName("failureMessage"u8);
-                writer.WriteStringValue(FailureMessage);
-            }
-        }
-
-        AvsPrivateCloudFailedEventData IJsonModel<AvsPrivateCloudFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsPrivateCloudFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsPrivateCloudFailedEventData(document.RootElement, options);
-        }
-
-        internal static AvsPrivateCloudFailedEventData DeserializeAvsPrivateCloudFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string failureMessage = default;
-            string operationId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("failureMessage"u8))
-                {
-                    failureMessage = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsPrivateCloudFailedEventData(operationId, serializedAdditionalRawData, failureMessage);
-        }
-
-        BinaryData IPersistableModel<AvsPrivateCloudFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsPrivateCloudFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsPrivateCloudFailedEventData IPersistableModel<AvsPrivateCloudFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsPrivateCloudFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsPrivateCloudFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsPrivateCloudFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsPrivateCloudFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsPrivateCloudFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudFailedEventData.cs
deleted file mode 100644
index 58e2c3216b39..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudFailedEventData.cs
+++ /dev/null
@@ -1,33 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.PrivateCloudFailed event. </summary>
-    public partial class AvsPrivateCloudFailedEventData : AvsPrivateCloudEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsPrivateCloudFailedEventData"/>. </summary>
-        internal AvsPrivateCloudFailedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsPrivateCloudFailedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="failureMessage"> Failure reason of an event. </param>
-        internal AvsPrivateCloudFailedEventData(string operationId, IDictionary<string, BinaryData> serializedAdditionalRawData, string failureMessage) : base(operationId, serializedAdditionalRawData)
-        {
-            FailureMessage = failureMessage;
-        }
-
-        /// <summary> Failure reason of an event. </summary>
-        public string FailureMessage { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatedEventData.Serialization.cs
deleted file mode 100644
index aaee57b3c3ab..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsPrivateCloudUpdatedEventData : IUtf8JsonSerializable, IJsonModel<AvsPrivateCloudUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsPrivateCloudUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsPrivateCloudUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsPrivateCloudUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AvsPrivateCloudUpdatedEventData IJsonModel<AvsPrivateCloudUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsPrivateCloudUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsPrivateCloudUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static AvsPrivateCloudUpdatedEventData DeserializeAvsPrivateCloudUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsPrivateCloudUpdatedEventData(operationId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsPrivateCloudUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsPrivateCloudUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsPrivateCloudUpdatedEventData IPersistableModel<AvsPrivateCloudUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsPrivateCloudUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsPrivateCloudUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsPrivateCloudUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsPrivateCloudUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsPrivateCloudUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatedEventData.cs
deleted file mode 100644
index 523ad0039dad..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatedEventData.cs
+++ /dev/null
@@ -1,28 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.PrivateCloudUpdated event. </summary>
-    public partial class AvsPrivateCloudUpdatedEventData : AvsPrivateCloudEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsPrivateCloudUpdatedEventData"/>. </summary>
-        internal AvsPrivateCloudUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsPrivateCloudUpdatedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsPrivateCloudUpdatedEventData(string operationId, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(operationId, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatingEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatingEventData.Serialization.cs
deleted file mode 100644
index e1f205446223..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatingEventData.Serialization.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsPrivateCloudUpdatingEventData : IUtf8JsonSerializable, IJsonModel<AvsPrivateCloudUpdatingEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsPrivateCloudUpdatingEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsPrivateCloudUpdatingEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudUpdatingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsPrivateCloudUpdatingEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AvsPrivateCloudUpdatingEventData IJsonModel<AvsPrivateCloudUpdatingEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudUpdatingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsPrivateCloudUpdatingEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsPrivateCloudUpdatingEventData(document.RootElement, options);
-        }
-
-        internal static AvsPrivateCloudUpdatingEventData DeserializeAvsPrivateCloudUpdatingEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsPrivateCloudUpdatingEventData(operationId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsPrivateCloudUpdatingEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudUpdatingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsPrivateCloudUpdatingEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsPrivateCloudUpdatingEventData IPersistableModel<AvsPrivateCloudUpdatingEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsPrivateCloudUpdatingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsPrivateCloudUpdatingEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsPrivateCloudUpdatingEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsPrivateCloudUpdatingEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsPrivateCloudUpdatingEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsPrivateCloudUpdatingEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatingEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatingEventData.cs
deleted file mode 100644
index d3bd82ababd3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsPrivateCloudUpdatingEventData.cs
+++ /dev/null
@@ -1,28 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.PrivateCloudUpdating event. </summary>
-    public partial class AvsPrivateCloudUpdatingEventData : AvsPrivateCloudEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsPrivateCloudUpdatingEventData"/>. </summary>
-        internal AvsPrivateCloudUpdatingEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsPrivateCloudUpdatingEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsPrivateCloudUpdatingEventData(string operationId, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(operationId, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionCancelledEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionCancelledEventData.Serialization.cs
deleted file mode 100644
index ad1156bb8117..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionCancelledEventData.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsScriptExecutionCancelledEventData : IUtf8JsonSerializable, IJsonModel<AvsScriptExecutionCancelledEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsScriptExecutionCancelledEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsScriptExecutionCancelledEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionCancelledEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AvsScriptExecutionCancelledEventData IJsonModel<AvsScriptExecutionCancelledEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionCancelledEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsScriptExecutionCancelledEventData(document.RootElement, options);
-        }
-
-        internal static AvsScriptExecutionCancelledEventData DeserializeAvsScriptExecutionCancelledEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            string cmdletId = default;
-            IReadOnlyList<string> output = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("cmdletId"u8))
-                {
-                    cmdletId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    output = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsScriptExecutionCancelledEventData(operationId, cmdletId, output ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsScriptExecutionCancelledEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionCancelledEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsScriptExecutionCancelledEventData IPersistableModel<AvsScriptExecutionCancelledEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsScriptExecutionCancelledEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionCancelledEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsScriptExecutionCancelledEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsScriptExecutionCancelledEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsScriptExecutionCancelledEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionCancelledEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionCancelledEventData.cs
deleted file mode 100644
index 0116ef430dee..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionCancelledEventData.cs
+++ /dev/null
@@ -1,30 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ScriptExecutionCancelled event. </summary>
-    public partial class AvsScriptExecutionCancelledEventData : AvsScriptExecutionEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionCancelledEventData"/>. </summary>
-        internal AvsScriptExecutionCancelledEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionCancelledEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsScriptExecutionCancelledEventData(string operationId, string cmdletId, IReadOnlyList<string> output, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(operationId, cmdletId, output, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionEventData.Serialization.cs
deleted file mode 100644
index c22765b20104..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionEventData.Serialization.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsScriptExecutionEventData : IUtf8JsonSerializable, IJsonModel<AvsScriptExecutionEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsScriptExecutionEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsScriptExecutionEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(OperationId))
-            {
-                writer.WritePropertyName("operationId"u8);
-                writer.WriteStringValue(OperationId);
-            }
-            if (Optional.IsDefined(CmdletId))
-            {
-                writer.WritePropertyName("cmdletId"u8);
-                writer.WriteStringValue(CmdletId);
-            }
-            if (Optional.IsCollectionDefined(Output))
-            {
-                writer.WritePropertyName("output"u8);
-                writer.WriteStartArray();
-                foreach (var item in Output)
-                {
-                    writer.WriteStringValue(item);
-                }
-                writer.WriteEndArray();
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AvsScriptExecutionEventData IJsonModel<AvsScriptExecutionEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsScriptExecutionEventData(document.RootElement, options);
-        }
-
-        internal static AvsScriptExecutionEventData DeserializeAvsScriptExecutionEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            string cmdletId = default;
-            IReadOnlyList<string> output = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("cmdletId"u8))
-                {
-                    cmdletId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    output = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsScriptExecutionEventData(operationId, cmdletId, output ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsScriptExecutionEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsScriptExecutionEventData IPersistableModel<AvsScriptExecutionEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsScriptExecutionEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsScriptExecutionEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AvsScriptExecutionEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsScriptExecutionEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionEventData.cs
deleted file mode 100644
index d21ddf7920bf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionEventData.cs
+++ /dev/null
@@ -1,74 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for Microsoft.AVS/scriptExecutions events. </summary>
-    public partial class AvsScriptExecutionEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionEventData"/>. </summary>
-        internal AvsScriptExecutionEventData()
-        {
-            Output = new ChangeTrackingList<string>();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsScriptExecutionEventData(string operationId, string cmdletId, IReadOnlyList<string> output, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            OperationId = operationId;
-            CmdletId = cmdletId;
-            Output = output;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Id of the operation that caused this event. </summary>
-        public string OperationId { get; }
-        /// <summary> Cmdlet referenced in the execution that caused this event. </summary>
-        public string CmdletId { get; }
-        /// <summary> Stdout outputs from the execution, if any. </summary>
-        public IReadOnlyList<string> Output { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFailedEventData.Serialization.cs
deleted file mode 100644
index 69310ee24c2b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsScriptExecutionFailedEventData : IUtf8JsonSerializable, IJsonModel<AvsScriptExecutionFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsScriptExecutionFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsScriptExecutionFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(FailureMessage))
-            {
-                writer.WritePropertyName("failureMessage"u8);
-                writer.WriteStringValue(FailureMessage);
-            }
-        }
-
-        AvsScriptExecutionFailedEventData IJsonModel<AvsScriptExecutionFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsScriptExecutionFailedEventData(document.RootElement, options);
-        }
-
-        internal static AvsScriptExecutionFailedEventData DeserializeAvsScriptExecutionFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string failureMessage = default;
-            string operationId = default;
-            string cmdletId = default;
-            IReadOnlyList<string> output = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("failureMessage"u8))
-                {
-                    failureMessage = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("cmdletId"u8))
-                {
-                    cmdletId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    output = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsScriptExecutionFailedEventData(operationId, cmdletId, output ?? new ChangeTrackingList<string>(), serializedAdditionalRawData, failureMessage);
-        }
-
-        BinaryData IPersistableModel<AvsScriptExecutionFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsScriptExecutionFailedEventData IPersistableModel<AvsScriptExecutionFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsScriptExecutionFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsScriptExecutionFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsScriptExecutionFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsScriptExecutionFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFailedEventData.cs
deleted file mode 100644
index e5a135482869..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFailedEventData.cs
+++ /dev/null
@@ -1,35 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ScriptExecutionFailed event. </summary>
-    public partial class AvsScriptExecutionFailedEventData : AvsScriptExecutionEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionFailedEventData"/>. </summary>
-        internal AvsScriptExecutionFailedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionFailedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="failureMessage"> Failure reason of an event. </param>
-        internal AvsScriptExecutionFailedEventData(string operationId, string cmdletId, IReadOnlyList<string> output, IDictionary<string, BinaryData> serializedAdditionalRawData, string failureMessage) : base(operationId, cmdletId, output, serializedAdditionalRawData)
-        {
-            FailureMessage = failureMessage;
-        }
-
-        /// <summary> Failure reason of an event. </summary>
-        public string FailureMessage { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFinishedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFinishedEventData.Serialization.cs
deleted file mode 100644
index 6556b3dd64fb..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFinishedEventData.Serialization.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsScriptExecutionFinishedEventData : IUtf8JsonSerializable, IJsonModel<AvsScriptExecutionFinishedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsScriptExecutionFinishedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsScriptExecutionFinishedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionFinishedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("namedOutputs"u8);
-            writer.WriteStartObject();
-            foreach (var item in NamedOutputs)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-        }
-
-        AvsScriptExecutionFinishedEventData IJsonModel<AvsScriptExecutionFinishedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionFinishedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsScriptExecutionFinishedEventData(document.RootElement, options);
-        }
-
-        internal static AvsScriptExecutionFinishedEventData DeserializeAvsScriptExecutionFinishedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyDictionary<string, string> namedOutputs = default;
-            string operationId = default;
-            string cmdletId = default;
-            IReadOnlyList<string> output = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("namedOutputs"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    namedOutputs = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("cmdletId"u8))
-                {
-                    cmdletId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    output = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsScriptExecutionFinishedEventData(operationId, cmdletId, output ?? new ChangeTrackingList<string>(), serializedAdditionalRawData, namedOutputs);
-        }
-
-        BinaryData IPersistableModel<AvsScriptExecutionFinishedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionFinishedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsScriptExecutionFinishedEventData IPersistableModel<AvsScriptExecutionFinishedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsScriptExecutionFinishedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionFinishedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsScriptExecutionFinishedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsScriptExecutionFinishedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsScriptExecutionFinishedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFinishedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFinishedEventData.cs
deleted file mode 100644
index 84f2fd9fd36a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionFinishedEventData.cs
+++ /dev/null
@@ -1,45 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ScriptExecutionFinished event. </summary>
-    public partial class AvsScriptExecutionFinishedEventData : AvsScriptExecutionEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionFinishedEventData"/>. </summary>
-        /// <param name="namedOutputs"> Named outputs of completed execution, if any. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="namedOutputs"/> is null. </exception>
-        internal AvsScriptExecutionFinishedEventData(IReadOnlyDictionary<string, string> namedOutputs)
-        {
-            Argument.AssertNotNull(namedOutputs, nameof(namedOutputs));
-
-            NamedOutputs = namedOutputs;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionFinishedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="namedOutputs"> Named outputs of completed execution, if any. </param>
-        internal AvsScriptExecutionFinishedEventData(string operationId, string cmdletId, IReadOnlyList<string> output, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyDictionary<string, string> namedOutputs) : base(operationId, cmdletId, output, serializedAdditionalRawData)
-        {
-            NamedOutputs = namedOutputs;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionFinishedEventData"/> for deserialization. </summary>
-        internal AvsScriptExecutionFinishedEventData()
-        {
-        }
-
-        /// <summary> Named outputs of completed execution, if any. </summary>
-        public IReadOnlyDictionary<string, string> NamedOutputs { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionStartedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionStartedEventData.Serialization.cs
deleted file mode 100644
index 314ff99da136..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionStartedEventData.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class AvsScriptExecutionStartedEventData : IUtf8JsonSerializable, IJsonModel<AvsScriptExecutionStartedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AvsScriptExecutionStartedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<AvsScriptExecutionStartedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionStartedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        AvsScriptExecutionStartedEventData IJsonModel<AvsScriptExecutionStartedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AvsScriptExecutionStartedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAvsScriptExecutionStartedEventData(document.RootElement, options);
-        }
-
-        internal static AvsScriptExecutionStartedEventData DeserializeAvsScriptExecutionStartedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string operationId = default;
-            string cmdletId = default;
-            IReadOnlyList<string> output = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("operationId"u8))
-                {
-                    operationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("cmdletId"u8))
-                {
-                    cmdletId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    output = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AvsScriptExecutionStartedEventData(operationId, cmdletId, output ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AvsScriptExecutionStartedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionStartedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AvsScriptExecutionStartedEventData IPersistableModel<AvsScriptExecutionStartedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AvsScriptExecutionStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAvsScriptExecutionStartedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AvsScriptExecutionStartedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AvsScriptExecutionStartedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new AvsScriptExecutionStartedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAvsScriptExecutionStartedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionStartedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionStartedEventData.cs
deleted file mode 100644
index 08424798e522..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AvsScriptExecutionStartedEventData.cs
+++ /dev/null
@@ -1,30 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.AVS.ScriptExecutionStarted event. </summary>
-    public partial class AvsScriptExecutionStartedEventData : AvsScriptExecutionEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionStartedEventData"/>. </summary>
-        internal AvsScriptExecutionStartedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AvsScriptExecutionStartedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AvsScriptExecutionStartedEventData(string operationId, string cmdletId, IReadOnlyList<string> output, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(operationId, cmdletId, output, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationCloudEnvironmentModel.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationCloudEnvironmentModel.cs
deleted file mode 100644
index 5bbdda0f5e33..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationCloudEnvironmentModel.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Communication cloud environment model. </summary>
-    public readonly partial struct CommunicationCloudEnvironmentModel : IEquatable<CommunicationCloudEnvironmentModel>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="CommunicationCloudEnvironmentModel"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public CommunicationCloudEnvironmentModel(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string PublicValue = "public";
-        private const string DodValue = "dod";
-        private const string GcchValue = "gcch";
-
-        /// <summary> Public. </summary>
-        public static CommunicationCloudEnvironmentModel Public { get; } = new CommunicationCloudEnvironmentModel(PublicValue);
-        /// <summary> Dod. </summary>
-        public static CommunicationCloudEnvironmentModel Dod { get; } = new CommunicationCloudEnvironmentModel(DodValue);
-        /// <summary> Gcch. </summary>
-        public static CommunicationCloudEnvironmentModel Gcch { get; } = new CommunicationCloudEnvironmentModel(GcchValue);
-        /// <summary> Determines if two <see cref="CommunicationCloudEnvironmentModel"/> values are the same. </summary>
-        public static bool operator ==(CommunicationCloudEnvironmentModel left, CommunicationCloudEnvironmentModel right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="CommunicationCloudEnvironmentModel"/> values are not the same. </summary>
-        public static bool operator !=(CommunicationCloudEnvironmentModel left, CommunicationCloudEnvironmentModel right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="CommunicationCloudEnvironmentModel"/>. </summary>
-        public static implicit operator CommunicationCloudEnvironmentModel(string value) => new CommunicationCloudEnvironmentModel(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is CommunicationCloudEnvironmentModel other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(CommunicationCloudEnvironmentModel other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModel.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModel.Serialization.cs
deleted file mode 100644
index cc557dfeed21..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModel.Serialization.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class CommunicationIdentifierModel : IUtf8JsonSerializable, IJsonModel<CommunicationIdentifierModel>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CommunicationIdentifierModel>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<CommunicationIdentifierModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CommunicationIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(CommunicationIdentifierModel)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("kind"u8);
-            writer.WriteStringValue(Kind.ToString());
-            if (Optional.IsDefined(RawId))
-            {
-                writer.WritePropertyName("rawId"u8);
-                writer.WriteStringValue(RawId);
-            }
-            writer.WritePropertyName("communicationUser"u8);
-            writer.WriteObjectValue(CommunicationUser, options);
-            writer.WritePropertyName("phoneNumber"u8);
-            writer.WriteObjectValue(PhoneNumber, options);
-            writer.WritePropertyName("microsoftTeamsUser"u8);
-            writer.WriteObjectValue(MicrosoftTeamsUser, options);
-            writer.WritePropertyName("microsoftTeamsApp"u8);
-            writer.WriteObjectValue(MicrosoftTeamsApp, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        CommunicationIdentifierModel IJsonModel<CommunicationIdentifierModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CommunicationIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(CommunicationIdentifierModel)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeCommunicationIdentifierModel(document.RootElement, options);
-        }
-
-        internal static CommunicationIdentifierModel DeserializeCommunicationIdentifierModel(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            CommunicationIdentifierModelKind kind = default;
-            string rawId = default;
-            CommunicationUserIdentifierModel communicationUser = default;
-            PhoneNumberIdentifierModel phoneNumber = default;
-            MicrosoftTeamsUserIdentifierModel microsoftTeamsUser = default;
-            MicrosoftTeamsAppIdentifierModel microsoftTeamsApp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("kind"u8))
-                {
-                    kind = new CommunicationIdentifierModelKind(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("rawId"u8))
-                {
-                    rawId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("communicationUser"u8))
-                {
-                    communicationUser = CommunicationUserIdentifierModel.DeserializeCommunicationUserIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("phoneNumber"u8))
-                {
-                    phoneNumber = PhoneNumberIdentifierModel.DeserializePhoneNumberIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("microsoftTeamsUser"u8))
-                {
-                    microsoftTeamsUser = MicrosoftTeamsUserIdentifierModel.DeserializeMicrosoftTeamsUserIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("microsoftTeamsApp"u8))
-                {
-                    microsoftTeamsApp = MicrosoftTeamsAppIdentifierModel.DeserializeMicrosoftTeamsAppIdentifierModel(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new CommunicationIdentifierModel(
-                kind,
-                rawId,
-                communicationUser,
-                phoneNumber,
-                microsoftTeamsUser,
-                microsoftTeamsApp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<CommunicationIdentifierModel>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CommunicationIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(CommunicationIdentifierModel)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        CommunicationIdentifierModel IPersistableModel<CommunicationIdentifierModel>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CommunicationIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeCommunicationIdentifierModel(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(CommunicationIdentifierModel)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<CommunicationIdentifierModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static CommunicationIdentifierModel FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeCommunicationIdentifierModel(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModel.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModel.cs
deleted file mode 100644
index 391730bf3a99..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModel.cs
+++ /dev/null
@@ -1,106 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Identifies a participant in Azure Communication services. A participant is, for example, a phone number or an Azure communication user. This model must be interpreted as a union: Apart from rawId, at most one further property may be set. </summary>
-    public partial class CommunicationIdentifierModel
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="CommunicationIdentifierModel"/>. </summary>
-        /// <param name="kind"> The identifier kind. Only required in responses. </param>
-        /// <param name="communicationUser"> The communication user. </param>
-        /// <param name="phoneNumber"> The phone number. </param>
-        /// <param name="microsoftTeamsUser"> The Microsoft Teams user. </param>
-        /// <param name="microsoftTeamsApp"> The Microsoft Teams application. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="communicationUser"/>, <paramref name="phoneNumber"/>, <paramref name="microsoftTeamsUser"/> or <paramref name="microsoftTeamsApp"/> is null. </exception>
-        internal CommunicationIdentifierModel(CommunicationIdentifierModelKind kind, CommunicationUserIdentifierModel communicationUser, PhoneNumberIdentifierModel phoneNumber, MicrosoftTeamsUserIdentifierModel microsoftTeamsUser, MicrosoftTeamsAppIdentifierModel microsoftTeamsApp)
-        {
-            Argument.AssertNotNull(communicationUser, nameof(communicationUser));
-            Argument.AssertNotNull(phoneNumber, nameof(phoneNumber));
-            Argument.AssertNotNull(microsoftTeamsUser, nameof(microsoftTeamsUser));
-            Argument.AssertNotNull(microsoftTeamsApp, nameof(microsoftTeamsApp));
-
-            Kind = kind;
-            CommunicationUser = communicationUser;
-            PhoneNumber = phoneNumber;
-            MicrosoftTeamsUser = microsoftTeamsUser;
-            MicrosoftTeamsApp = microsoftTeamsApp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="CommunicationIdentifierModel"/>. </summary>
-        /// <param name="kind"> The identifier kind. Only required in responses. </param>
-        /// <param name="rawId"> Raw Id of the identifier. Optional in requests, required in responses. </param>
-        /// <param name="communicationUser"> The communication user. </param>
-        /// <param name="phoneNumber"> The phone number. </param>
-        /// <param name="microsoftTeamsUser"> The Microsoft Teams user. </param>
-        /// <param name="microsoftTeamsApp"> The Microsoft Teams application. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal CommunicationIdentifierModel(CommunicationIdentifierModelKind kind, string rawId, CommunicationUserIdentifierModel communicationUser, PhoneNumberIdentifierModel phoneNumber, MicrosoftTeamsUserIdentifierModel microsoftTeamsUser, MicrosoftTeamsAppIdentifierModel microsoftTeamsApp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Kind = kind;
-            RawId = rawId;
-            CommunicationUser = communicationUser;
-            PhoneNumber = phoneNumber;
-            MicrosoftTeamsUser = microsoftTeamsUser;
-            MicrosoftTeamsApp = microsoftTeamsApp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="CommunicationIdentifierModel"/> for deserialization. </summary>
-        internal CommunicationIdentifierModel()
-        {
-        }
-
-        /// <summary> The identifier kind. Only required in responses. </summary>
-        public CommunicationIdentifierModelKind Kind { get; }
-        /// <summary> Raw Id of the identifier. Optional in requests, required in responses. </summary>
-        public string RawId { get; }
-        /// <summary> The communication user. </summary>
-        public CommunicationUserIdentifierModel CommunicationUser { get; }
-        /// <summary> The phone number. </summary>
-        public PhoneNumberIdentifierModel PhoneNumber { get; }
-        /// <summary> The Microsoft Teams user. </summary>
-        public MicrosoftTeamsUserIdentifierModel MicrosoftTeamsUser { get; }
-        /// <summary> The Microsoft Teams application. </summary>
-        public MicrosoftTeamsAppIdentifierModel MicrosoftTeamsApp { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModelKind.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModelKind.cs
deleted file mode 100644
index be2f34395213..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationIdentifierModelKind.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Communication model identifier kind. </summary>
-    public readonly partial struct CommunicationIdentifierModelKind : IEquatable<CommunicationIdentifierModelKind>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="CommunicationIdentifierModelKind"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public CommunicationIdentifierModelKind(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string UnknownValue = "unknown";
-        private const string CommunicationUserValue = "communicationUser";
-        private const string PhoneNumberValue = "phoneNumber";
-        private const string MicrosoftTeamsUserValue = "microsoftTeamsUser";
-
-        /// <summary> Unknown. </summary>
-        public static CommunicationIdentifierModelKind Unknown { get; } = new CommunicationIdentifierModelKind(UnknownValue);
-        /// <summary> Communication User. </summary>
-        public static CommunicationIdentifierModelKind CommunicationUser { get; } = new CommunicationIdentifierModelKind(CommunicationUserValue);
-        /// <summary> Phone Number. </summary>
-        public static CommunicationIdentifierModelKind PhoneNumber { get; } = new CommunicationIdentifierModelKind(PhoneNumberValue);
-        /// <summary> Microsoft Teams User. </summary>
-        public static CommunicationIdentifierModelKind MicrosoftTeamsUser { get; } = new CommunicationIdentifierModelKind(MicrosoftTeamsUserValue);
-        /// <summary> Determines if two <see cref="CommunicationIdentifierModelKind"/> values are the same. </summary>
-        public static bool operator ==(CommunicationIdentifierModelKind left, CommunicationIdentifierModelKind right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="CommunicationIdentifierModelKind"/> values are not the same. </summary>
-        public static bool operator !=(CommunicationIdentifierModelKind left, CommunicationIdentifierModelKind right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="CommunicationIdentifierModelKind"/>. </summary>
-        public static implicit operator CommunicationIdentifierModelKind(string value) => new CommunicationIdentifierModelKind(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is CommunicationIdentifierModelKind other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(CommunicationIdentifierModelKind other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationUserIdentifierModel.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationUserIdentifierModel.Serialization.cs
deleted file mode 100644
index 782d8c253d17..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationUserIdentifierModel.Serialization.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class CommunicationUserIdentifierModel : IUtf8JsonSerializable, IJsonModel<CommunicationUserIdentifierModel>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CommunicationUserIdentifierModel>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<CommunicationUserIdentifierModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CommunicationUserIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(CommunicationUserIdentifierModel)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("id"u8);
-            writer.WriteStringValue(Id);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        CommunicationUserIdentifierModel IJsonModel<CommunicationUserIdentifierModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CommunicationUserIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(CommunicationUserIdentifierModel)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeCommunicationUserIdentifierModel(document.RootElement, options);
-        }
-
-        internal static CommunicationUserIdentifierModel DeserializeCommunicationUserIdentifierModel(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new CommunicationUserIdentifierModel(id, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<CommunicationUserIdentifierModel>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CommunicationUserIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(CommunicationUserIdentifierModel)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        CommunicationUserIdentifierModel IPersistableModel<CommunicationUserIdentifierModel>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CommunicationUserIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeCommunicationUserIdentifierModel(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(CommunicationUserIdentifierModel)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<CommunicationUserIdentifierModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static CommunicationUserIdentifierModel FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeCommunicationUserIdentifierModel(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationUserIdentifierModel.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationUserIdentifierModel.cs
deleted file mode 100644
index 784344c1c5e2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/CommunicationUserIdentifierModel.cs
+++ /dev/null
@@ -1,75 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> A user that got created with an Azure Communication Services resource. </summary>
-    public partial class CommunicationUserIdentifierModel
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="CommunicationUserIdentifierModel"/>. </summary>
-        /// <param name="id"> The Id of the communication user. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        internal CommunicationUserIdentifierModel(string id)
-        {
-            Argument.AssertNotNull(id, nameof(id));
-
-            Id = id;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="CommunicationUserIdentifierModel"/>. </summary>
-        /// <param name="id"> The Id of the communication user. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal CommunicationUserIdentifierModel(string id, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="CommunicationUserIdentifierModel"/> for deserialization. </summary>
-        internal CommunicationUserIdentifierModel()
-        {
-        }
-
-        /// <summary> The Id of the communication user. </summary>
-        public string Id { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventData.Serialization.cs
deleted file mode 100644
index 9c0c10f7ce8b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventData.Serialization.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryArtifactEventData : IUtf8JsonSerializable, IJsonModel<ContainerRegistryArtifactEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryArtifactEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryArtifactEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryArtifactEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryArtifactEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(Id);
-            }
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(Action))
-            {
-                writer.WritePropertyName("action"u8);
-                writer.WriteStringValue(Action);
-            }
-            if (Optional.IsDefined(Location))
-            {
-                writer.WritePropertyName("location"u8);
-                writer.WriteStringValue(Location);
-            }
-            writer.WritePropertyName("target"u8);
-            writer.WriteObjectValue(Target, options);
-            writer.WritePropertyName("connectedRegistry"u8);
-            writer.WriteObjectValue(ConnectedRegistry, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerRegistryArtifactEventData IJsonModel<ContainerRegistryArtifactEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryArtifactEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryArtifactEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryArtifactEventData(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryArtifactEventData DeserializeContainerRegistryArtifactEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            DateTimeOffset timestamp = default;
-            string action = default;
-            string location = default;
-            ContainerRegistryArtifactEventTarget target = default;
-            ContainerRegistryEventConnectedRegistry connectedRegistry = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("action"u8))
-                {
-                    action = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("location"u8))
-                {
-                    location = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("target"u8))
-                {
-                    target = ContainerRegistryArtifactEventTarget.DeserializeContainerRegistryArtifactEventTarget(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("connectedRegistry"u8))
-                {
-                    connectedRegistry = ContainerRegistryEventConnectedRegistry.DeserializeContainerRegistryEventConnectedRegistry(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryArtifactEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                connectedRegistry,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryArtifactEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryArtifactEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryArtifactEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryArtifactEventData IPersistableModel<ContainerRegistryArtifactEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryArtifactEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryArtifactEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryArtifactEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryArtifactEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerRegistryArtifactEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryArtifactEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventData.cs
deleted file mode 100644
index 9fb1972e3d56..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventData.cs
+++ /dev/null
@@ -1,100 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The content of the event request message. </summary>
-    public partial class ContainerRegistryArtifactEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryArtifactEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="target"/> or <paramref name="connectedRegistry"/> is null. </exception>
-        internal ContainerRegistryArtifactEventData(DateTimeOffset timestamp, ContainerRegistryArtifactEventTarget target, ContainerRegistryEventConnectedRegistry connectedRegistry)
-        {
-            Argument.AssertNotNull(target, nameof(target));
-            Argument.AssertNotNull(connectedRegistry, nameof(connectedRegistry));
-
-            Timestamp = timestamp;
-            Target = target;
-            ConnectedRegistry = connectedRegistry;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryArtifactEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryArtifactEventData(string id, DateTimeOffset timestamp, string action, string location, ContainerRegistryArtifactEventTarget target, ContainerRegistryEventConnectedRegistry connectedRegistry, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            Timestamp = timestamp;
-            Action = action;
-            Location = location;
-            Target = target;
-            ConnectedRegistry = connectedRegistry;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryArtifactEventData"/> for deserialization. </summary>
-        internal ContainerRegistryArtifactEventData()
-        {
-        }
-
-        /// <summary> The event ID. </summary>
-        public string Id { get; }
-        /// <summary> The time at which the event occurred. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The action that encompasses the provided event. </summary>
-        public string Action { get; }
-        /// <summary> The location of the event. </summary>
-        public string Location { get; }
-        /// <summary> The target of the event. </summary>
-        public ContainerRegistryArtifactEventTarget Target { get; }
-        /// <summary> The connected registry information if the event is generated by a connected registry. </summary>
-        public ContainerRegistryEventConnectedRegistry ConnectedRegistry { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventTarget.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventTarget.Serialization.cs
deleted file mode 100644
index a34f0291630d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventTarget.Serialization.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryArtifactEventTarget : IUtf8JsonSerializable, IJsonModel<ContainerRegistryArtifactEventTarget>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryArtifactEventTarget>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryArtifactEventTarget>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryArtifactEventTarget>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryArtifactEventTarget)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(MediaType))
-            {
-                writer.WritePropertyName("mediaType"u8);
-                writer.WriteStringValue(MediaType);
-            }
-            if (Optional.IsDefined(Size))
-            {
-                writer.WritePropertyName("size"u8);
-                writer.WriteNumberValue(Size.Value);
-            }
-            if (Optional.IsDefined(Digest))
-            {
-                writer.WritePropertyName("digest"u8);
-                writer.WriteStringValue(Digest);
-            }
-            if (Optional.IsDefined(Repository))
-            {
-                writer.WritePropertyName("repository"u8);
-                writer.WriteStringValue(Repository);
-            }
-            if (Optional.IsDefined(Tag))
-            {
-                writer.WritePropertyName("tag"u8);
-                writer.WriteStringValue(Tag);
-            }
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerRegistryArtifactEventTarget IJsonModel<ContainerRegistryArtifactEventTarget>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryArtifactEventTarget>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryArtifactEventTarget)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryArtifactEventTarget(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryArtifactEventTarget DeserializeContainerRegistryArtifactEventTarget(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string mediaType = default;
-            long? size = default;
-            string digest = default;
-            string repository = default;
-            string tag = default;
-            string name = default;
-            string version = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("mediaType"u8))
-                {
-                    mediaType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("size"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    size = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("digest"u8))
-                {
-                    digest = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("repository"u8))
-                {
-                    repository = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("tag"u8))
-                {
-                    tag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryArtifactEventTarget(
-                mediaType,
-                size,
-                digest,
-                repository,
-                tag,
-                name,
-                version,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryArtifactEventTarget>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryArtifactEventTarget>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryArtifactEventTarget)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryArtifactEventTarget IPersistableModel<ContainerRegistryArtifactEventTarget>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryArtifactEventTarget>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryArtifactEventTarget(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryArtifactEventTarget)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryArtifactEventTarget>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerRegistryArtifactEventTarget FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryArtifactEventTarget(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventTarget.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventTarget.cs
deleted file mode 100644
index a0b3692c64ba..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryArtifactEventTarget.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The target of the event. </summary>
-    public partial class ContainerRegistryArtifactEventTarget
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryArtifactEventTarget"/>. </summary>
-        internal ContainerRegistryArtifactEventTarget()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryArtifactEventTarget"/>. </summary>
-        /// <param name="mediaType"> The MIME type of the artifact. </param>
-        /// <param name="size"> The size in bytes of the artifact. </param>
-        /// <param name="digest"> The digest of the artifact. </param>
-        /// <param name="repository"> The repository name of the artifact. </param>
-        /// <param name="tag"> The tag of the artifact. </param>
-        /// <param name="name"> The name of the artifact. </param>
-        /// <param name="version"> The version of the artifact. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryArtifactEventTarget(string mediaType, long? size, string digest, string repository, string tag, string name, string version, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            MediaType = mediaType;
-            Size = size;
-            Digest = digest;
-            Repository = repository;
-            Tag = tag;
-            Name = name;
-            Version = version;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The MIME type of the artifact. </summary>
-        public string MediaType { get; }
-        /// <summary> The size in bytes of the artifact. </summary>
-        public long? Size { get; }
-        /// <summary> The digest of the artifact. </summary>
-        public string Digest { get; }
-        /// <summary> The repository name of the artifact. </summary>
-        public string Repository { get; }
-        /// <summary> The tag of the artifact. </summary>
-        public string Tag { get; }
-        /// <summary> The name of the artifact. </summary>
-        public string Name { get; }
-        /// <summary> The version of the artifact. </summary>
-        public string Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartDeletedEventData.Serialization.cs
deleted file mode 100644
index e10e1f4b30e6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryChartDeletedEventData : IUtf8JsonSerializable, IJsonModel<ContainerRegistryChartDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryChartDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryChartDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryChartDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryChartDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerRegistryChartDeletedEventData IJsonModel<ContainerRegistryChartDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryChartDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryChartDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryChartDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryChartDeletedEventData DeserializeContainerRegistryChartDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            DateTimeOffset timestamp = default;
-            string action = default;
-            string location = default;
-            ContainerRegistryArtifactEventTarget target = default;
-            ContainerRegistryEventConnectedRegistry connectedRegistry = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("action"u8))
-                {
-                    action = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("location"u8))
-                {
-                    location = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("target"u8))
-                {
-                    target = ContainerRegistryArtifactEventTarget.DeserializeContainerRegistryArtifactEventTarget(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("connectedRegistry"u8))
-                {
-                    connectedRegistry = ContainerRegistryEventConnectedRegistry.DeserializeContainerRegistryEventConnectedRegistry(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryChartDeletedEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                connectedRegistry,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryChartDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryChartDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryChartDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryChartDeletedEventData IPersistableModel<ContainerRegistryChartDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryChartDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryChartDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryChartDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryChartDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerRegistryChartDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryChartDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartDeletedEventData.cs
deleted file mode 100644
index c51cacba09e9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartDeletedEventData.cs
+++ /dev/null
@@ -1,44 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerRegistry.ChartDeleted event. </summary>
-    public partial class ContainerRegistryChartDeletedEventData : ContainerRegistryArtifactEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryChartDeletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="target"/> or <paramref name="connectedRegistry"/> is null. </exception>
-        internal ContainerRegistryChartDeletedEventData(DateTimeOffset timestamp, ContainerRegistryArtifactEventTarget target, ContainerRegistryEventConnectedRegistry connectedRegistry) : base(timestamp, target, connectedRegistry)
-        {
-            Argument.AssertNotNull(target, nameof(target));
-            Argument.AssertNotNull(connectedRegistry, nameof(connectedRegistry));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryChartDeletedEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryChartDeletedEventData(string id, DateTimeOffset timestamp, string action, string location, ContainerRegistryArtifactEventTarget target, ContainerRegistryEventConnectedRegistry connectedRegistry, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, timestamp, action, location, target, connectedRegistry, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryChartDeletedEventData"/> for deserialization. </summary>
-        internal ContainerRegistryChartDeletedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartPushedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartPushedEventData.Serialization.cs
deleted file mode 100644
index 6e292e2bd1fd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartPushedEventData.Serialization.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryChartPushedEventData : IUtf8JsonSerializable, IJsonModel<ContainerRegistryChartPushedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryChartPushedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryChartPushedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryChartPushedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryChartPushedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerRegistryChartPushedEventData IJsonModel<ContainerRegistryChartPushedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryChartPushedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryChartPushedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryChartPushedEventData(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryChartPushedEventData DeserializeContainerRegistryChartPushedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            DateTimeOffset timestamp = default;
-            string action = default;
-            string location = default;
-            ContainerRegistryArtifactEventTarget target = default;
-            ContainerRegistryEventConnectedRegistry connectedRegistry = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("action"u8))
-                {
-                    action = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("location"u8))
-                {
-                    location = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("target"u8))
-                {
-                    target = ContainerRegistryArtifactEventTarget.DeserializeContainerRegistryArtifactEventTarget(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("connectedRegistry"u8))
-                {
-                    connectedRegistry = ContainerRegistryEventConnectedRegistry.DeserializeContainerRegistryEventConnectedRegistry(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryChartPushedEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                connectedRegistry,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryChartPushedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryChartPushedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryChartPushedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryChartPushedEventData IPersistableModel<ContainerRegistryChartPushedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryChartPushedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryChartPushedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryChartPushedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryChartPushedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerRegistryChartPushedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryChartPushedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartPushedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartPushedEventData.cs
deleted file mode 100644
index 1e05ff576eac..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryChartPushedEventData.cs
+++ /dev/null
@@ -1,44 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerRegistry.ChartPushed event. </summary>
-    public partial class ContainerRegistryChartPushedEventData : ContainerRegistryArtifactEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryChartPushedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="target"/> or <paramref name="connectedRegistry"/> is null. </exception>
-        internal ContainerRegistryChartPushedEventData(DateTimeOffset timestamp, ContainerRegistryArtifactEventTarget target, ContainerRegistryEventConnectedRegistry connectedRegistry) : base(timestamp, target, connectedRegistry)
-        {
-            Argument.AssertNotNull(target, nameof(target));
-            Argument.AssertNotNull(connectedRegistry, nameof(connectedRegistry));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryChartPushedEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryChartPushedEventData(string id, DateTimeOffset timestamp, string action, string location, ContainerRegistryArtifactEventTarget target, ContainerRegistryEventConnectedRegistry connectedRegistry, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, timestamp, action, location, target, connectedRegistry, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryChartPushedEventData"/> for deserialization. </summary>
-        internal ContainerRegistryChartPushedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventActor.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventActor.Serialization.cs
deleted file mode 100644
index bff224370e7f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventActor.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryEventActor : IUtf8JsonSerializable, IJsonModel<ContainerRegistryEventActor>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryEventActor>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryEventActor>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventActor>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventActor)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerRegistryEventActor IJsonModel<ContainerRegistryEventActor>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventActor>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventActor)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryEventActor(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryEventActor DeserializeContainerRegistryEventActor(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryEventActor(name, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryEventActor>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventActor>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventActor)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryEventActor IPersistableModel<ContainerRegistryEventActor>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventActor>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryEventActor(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventActor)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryEventActor>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerRegistryEventActor FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryEventActor(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventActor.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventActor.cs
deleted file mode 100644
index feb212ebef28..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventActor.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </summary>
-    public partial class ContainerRegistryEventActor
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventActor"/>. </summary>
-        internal ContainerRegistryEventActor()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventActor"/>. </summary>
-        /// <param name="name"> The subject or username associated with the request context that generated the event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryEventActor(string name, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Name = name;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The subject or username associated with the request context that generated the event. </summary>
-        public string Name { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventConnectedRegistry.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventConnectedRegistry.Serialization.cs
deleted file mode 100644
index b28bb98afa41..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventConnectedRegistry.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryEventConnectedRegistry : IUtf8JsonSerializable, IJsonModel<ContainerRegistryEventConnectedRegistry>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryEventConnectedRegistry>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryEventConnectedRegistry>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventConnectedRegistry>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventConnectedRegistry)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerRegistryEventConnectedRegistry IJsonModel<ContainerRegistryEventConnectedRegistry>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventConnectedRegistry>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventConnectedRegistry)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryEventConnectedRegistry(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryEventConnectedRegistry DeserializeContainerRegistryEventConnectedRegistry(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryEventConnectedRegistry(name, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryEventConnectedRegistry>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventConnectedRegistry>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventConnectedRegistry)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryEventConnectedRegistry IPersistableModel<ContainerRegistryEventConnectedRegistry>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventConnectedRegistry>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryEventConnectedRegistry(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventConnectedRegistry)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryEventConnectedRegistry>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerRegistryEventConnectedRegistry FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryEventConnectedRegistry(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventConnectedRegistry.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventConnectedRegistry.cs
deleted file mode 100644
index 60e9c7295966..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventConnectedRegistry.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The connected registry information if the event is generated by a connected registry. </summary>
-    public partial class ContainerRegistryEventConnectedRegistry
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventConnectedRegistry"/>. </summary>
-        internal ContainerRegistryEventConnectedRegistry()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventConnectedRegistry"/>. </summary>
-        /// <param name="name"> The name of the connected registry that generated this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryEventConnectedRegistry(string name, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Name = name;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The name of the connected registry that generated this event. </summary>
-        public string Name { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventData.Serialization.cs
deleted file mode 100644
index e9f801089099..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventData.Serialization.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryEventData : IUtf8JsonSerializable, IJsonModel<ContainerRegistryEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(Id);
-            }
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(Action))
-            {
-                writer.WritePropertyName("action"u8);
-                writer.WriteStringValue(Action);
-            }
-            if (Optional.IsDefined(Location))
-            {
-                writer.WritePropertyName("location"u8);
-                writer.WriteStringValue(Location);
-            }
-            writer.WritePropertyName("target"u8);
-            writer.WriteObjectValue(Target, options);
-            writer.WritePropertyName("request"u8);
-            writer.WriteObjectValue(Request, options);
-            writer.WritePropertyName("actor"u8);
-            writer.WriteObjectValue(Actor, options);
-            writer.WritePropertyName("source"u8);
-            writer.WriteObjectValue(Source, options);
-            writer.WritePropertyName("connectedRegistry"u8);
-            writer.WriteObjectValue(ConnectedRegistry, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerRegistryEventData IJsonModel<ContainerRegistryEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryEventData(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryEventData DeserializeContainerRegistryEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            DateTimeOffset timestamp = default;
-            string action = default;
-            string location = default;
-            ContainerRegistryEventTarget target = default;
-            ContainerRegistryEventRequest request = default;
-            ContainerRegistryEventActor actor = default;
-            ContainerRegistryEventSource source = default;
-            ContainerRegistryEventConnectedRegistry connectedRegistry = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("action"u8))
-                {
-                    action = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("location"u8))
-                {
-                    location = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("target"u8))
-                {
-                    target = ContainerRegistryEventTarget.DeserializeContainerRegistryEventTarget(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("request"u8))
-                {
-                    request = ContainerRegistryEventRequest.DeserializeContainerRegistryEventRequest(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("actor"u8))
-                {
-                    actor = ContainerRegistryEventActor.DeserializeContainerRegistryEventActor(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("source"u8))
-                {
-                    source = ContainerRegistryEventSource.DeserializeContainerRegistryEventSource(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("connectedRegistry"u8))
-                {
-                    connectedRegistry = ContainerRegistryEventConnectedRegistry.DeserializeContainerRegistryEventConnectedRegistry(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                request,
-                actor,
-                source,
-                connectedRegistry,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryEventData IPersistableModel<ContainerRegistryEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerRegistryEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventData.cs
deleted file mode 100644
index 6f9e05701bed..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The content of the event request message. </summary>
-    public partial class ContainerRegistryEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="target"/>, <paramref name="request"/>, <paramref name="actor"/>, <paramref name="source"/> or <paramref name="connectedRegistry"/> is null. </exception>
-        internal ContainerRegistryEventData(DateTimeOffset timestamp, ContainerRegistryEventTarget target, ContainerRegistryEventRequest request, ContainerRegistryEventActor actor, ContainerRegistryEventSource source, ContainerRegistryEventConnectedRegistry connectedRegistry)
-        {
-            Argument.AssertNotNull(target, nameof(target));
-            Argument.AssertNotNull(request, nameof(request));
-            Argument.AssertNotNull(actor, nameof(actor));
-            Argument.AssertNotNull(source, nameof(source));
-            Argument.AssertNotNull(connectedRegistry, nameof(connectedRegistry));
-
-            Timestamp = timestamp;
-            Target = target;
-            Request = request;
-            Actor = actor;
-            Source = source;
-            ConnectedRegistry = connectedRegistry;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryEventData(string id, DateTimeOffset timestamp, string action, string location, ContainerRegistryEventTarget target, ContainerRegistryEventRequest request, ContainerRegistryEventActor actor, ContainerRegistryEventSource source, ContainerRegistryEventConnectedRegistry connectedRegistry, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            Timestamp = timestamp;
-            Action = action;
-            Location = location;
-            Target = target;
-            Request = request;
-            Actor = actor;
-            Source = source;
-            ConnectedRegistry = connectedRegistry;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventData"/> for deserialization. </summary>
-        internal ContainerRegistryEventData()
-        {
-        }
-
-        /// <summary> The event ID. </summary>
-        public string Id { get; }
-        /// <summary> The time at which the event occurred. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The action that encompasses the provided event. </summary>
-        public string Action { get; }
-        /// <summary> The location of the event. </summary>
-        public string Location { get; }
-        /// <summary> The target of the event. </summary>
-        public ContainerRegistryEventTarget Target { get; }
-        /// <summary> The request that generated the event. </summary>
-        public ContainerRegistryEventRequest Request { get; }
-        /// <summary> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </summary>
-        public ContainerRegistryEventActor Actor { get; }
-        /// <summary> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </summary>
-        public ContainerRegistryEventSource Source { get; }
-        /// <summary> The connected registry information if the event is generated by a connected registry. </summary>
-        public ContainerRegistryEventConnectedRegistry ConnectedRegistry { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventRequest.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventRequest.Serialization.cs
deleted file mode 100644
index f1d8f38ecf9f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventRequest.Serialization.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryEventRequest : IUtf8JsonSerializable, IJsonModel<ContainerRegistryEventRequest>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryEventRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryEventRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventRequest)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(Addr))
-            {
-                writer.WritePropertyName("addr"u8);
-                writer.WriteStringValue(Addr);
-            }
-            if (Optional.IsDefined(Host))
-            {
-                writer.WritePropertyName("host"u8);
-                writer.WriteStringValue(Host);
-            }
-            if (Optional.IsDefined(Method))
-            {
-                writer.WritePropertyName("method"u8);
-                writer.WriteStringValue(Method);
-            }
-            if (Optional.IsDefined(Useragent))
-            {
-                writer.WritePropertyName("useragent"u8);
-                writer.WriteStringValue(Useragent);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerRegistryEventRequest IJsonModel<ContainerRegistryEventRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventRequest)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryEventRequest(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryEventRequest DeserializeContainerRegistryEventRequest(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string addr = default;
-            string host = default;
-            string method = default;
-            string useragent = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("addr"u8))
-                {
-                    addr = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("host"u8))
-                {
-                    host = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("method"u8))
-                {
-                    method = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("useragent"u8))
-                {
-                    useragent = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryEventRequest(
-                id,
-                addr,
-                host,
-                method,
-                useragent,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryEventRequest>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventRequest>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventRequest)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryEventRequest IPersistableModel<ContainerRegistryEventRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventRequest>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryEventRequest(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventRequest)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryEventRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerRegistryEventRequest FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryEventRequest(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventRequest.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventRequest.cs
deleted file mode 100644
index c53cd2d48a7c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventRequest.cs
+++ /dev/null
@@ -1,81 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The request that generated the event. </summary>
-    public partial class ContainerRegistryEventRequest
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventRequest"/>. </summary>
-        internal ContainerRegistryEventRequest()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventRequest"/>. </summary>
-        /// <param name="id"> The ID of the request that initiated the event. </param>
-        /// <param name="addr"> The IP or hostname and possibly port of the client connection that initiated the event. This is the RemoteAddr from the standard http request. </param>
-        /// <param name="host"> The externally accessible hostname of the registry instance, as specified by the http host header on incoming requests. </param>
-        /// <param name="method"> The request method that generated the event. </param>
-        /// <param name="useragent"> The user agent header of the request. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryEventRequest(string id, string addr, string host, string method, string useragent, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            Addr = addr;
-            Host = host;
-            Method = method;
-            Useragent = useragent;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The ID of the request that initiated the event. </summary>
-        public string Id { get; }
-        /// <summary> The IP or hostname and possibly port of the client connection that initiated the event. This is the RemoteAddr from the standard http request. </summary>
-        public string Addr { get; }
-        /// <summary> The externally accessible hostname of the registry instance, as specified by the http host header on incoming requests. </summary>
-        public string Host { get; }
-        /// <summary> The request method that generated the event. </summary>
-        public string Method { get; }
-        /// <summary> The user agent header of the request. </summary>
-        public string Useragent { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventSource.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventSource.Serialization.cs
deleted file mode 100644
index 5594050a3df3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventSource.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryEventSource : IUtf8JsonSerializable, IJsonModel<ContainerRegistryEventSource>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryEventSource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryEventSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventSource)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Addr))
-            {
-                writer.WritePropertyName("addr"u8);
-                writer.WriteStringValue(Addr);
-            }
-            if (Optional.IsDefined(InstanceID))
-            {
-                writer.WritePropertyName("instanceID"u8);
-                writer.WriteStringValue(InstanceID);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerRegistryEventSource IJsonModel<ContainerRegistryEventSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryEventSource(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryEventSource DeserializeContainerRegistryEventSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string addr = default;
-            string instanceID = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("addr"u8))
-                {
-                    addr = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("instanceID"u8))
-                {
-                    instanceID = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryEventSource(addr, instanceID, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryEventSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryEventSource IPersistableModel<ContainerRegistryEventSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryEventSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryEventSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerRegistryEventSource FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryEventSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventSource.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventSource.cs
deleted file mode 100644
index 7164efbf89ab..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventSource.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </summary>
-    public partial class ContainerRegistryEventSource
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventSource"/>. </summary>
-        internal ContainerRegistryEventSource()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventSource"/>. </summary>
-        /// <param name="addr"> The IP or hostname and the port of the registry node that generated the event. Generally, this will be resolved by os.Hostname() along with the running port. </param>
-        /// <param name="instanceID"> The running instance of an application. Changes after each restart. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryEventSource(string addr, string instanceID, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Addr = addr;
-            InstanceID = instanceID;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The IP or hostname and the port of the registry node that generated the event. Generally, this will be resolved by os.Hostname() along with the running port. </summary>
-        public string Addr { get; }
-        /// <summary> The running instance of an application. Changes after each restart. </summary>
-        public string InstanceID { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventTarget.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventTarget.Serialization.cs
deleted file mode 100644
index b04cd91daf5b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventTarget.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryEventTarget : IUtf8JsonSerializable, IJsonModel<ContainerRegistryEventTarget>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryEventTarget>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryEventTarget>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventTarget>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventTarget)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(MediaType))
-            {
-                writer.WritePropertyName("mediaType"u8);
-                writer.WriteStringValue(MediaType);
-            }
-            if (Optional.IsDefined(Size))
-            {
-                writer.WritePropertyName("size"u8);
-                writer.WriteNumberValue(Size.Value);
-            }
-            if (Optional.IsDefined(Digest))
-            {
-                writer.WritePropertyName("digest"u8);
-                writer.WriteStringValue(Digest);
-            }
-            if (Optional.IsDefined(Length))
-            {
-                writer.WritePropertyName("length"u8);
-                writer.WriteNumberValue(Length.Value);
-            }
-            if (Optional.IsDefined(Repository))
-            {
-                writer.WritePropertyName("repository"u8);
-                writer.WriteStringValue(Repository);
-            }
-            if (Optional.IsDefined(Url))
-            {
-                writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Url);
-            }
-            if (Optional.IsDefined(Tag))
-            {
-                writer.WritePropertyName("tag"u8);
-                writer.WriteStringValue(Tag);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerRegistryEventTarget IJsonModel<ContainerRegistryEventTarget>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventTarget>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryEventTarget)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryEventTarget(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryEventTarget DeserializeContainerRegistryEventTarget(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string mediaType = default;
-            long? size = default;
-            string digest = default;
-            long? length = default;
-            string repository = default;
-            string url = default;
-            string tag = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("mediaType"u8))
-                {
-                    mediaType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("size"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    size = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("digest"u8))
-                {
-                    digest = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("length"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    length = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("repository"u8))
-                {
-                    repository = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("url"u8))
-                {
-                    url = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("tag"u8))
-                {
-                    tag = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryEventTarget(
-                mediaType,
-                size,
-                digest,
-                length,
-                repository,
-                url,
-                tag,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryEventTarget>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventTarget>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventTarget)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryEventTarget IPersistableModel<ContainerRegistryEventTarget>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryEventTarget>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryEventTarget(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryEventTarget)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryEventTarget>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerRegistryEventTarget FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryEventTarget(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventTarget.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventTarget.cs
deleted file mode 100644
index 1494dff1e4ff..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryEventTarget.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The target of the event. </summary>
-    public partial class ContainerRegistryEventTarget
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventTarget"/>. </summary>
-        internal ContainerRegistryEventTarget()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryEventTarget"/>. </summary>
-        /// <param name="mediaType"> The MIME type of the referenced object. </param>
-        /// <param name="size"> The number of bytes of the content. Same as Length field. </param>
-        /// <param name="digest"> The digest of the content, as defined by the Registry V2 HTTP API Specification. </param>
-        /// <param name="length"> The number of bytes of the content. Same as Size field. </param>
-        /// <param name="repository"> The repository name. </param>
-        /// <param name="url"> The direct URL to the content. </param>
-        /// <param name="tag"> The tag name. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryEventTarget(string mediaType, long? size, string digest, long? length, string repository, string url, string tag, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            MediaType = mediaType;
-            Size = size;
-            Digest = digest;
-            Length = length;
-            Repository = repository;
-            Url = url;
-            Tag = tag;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The MIME type of the referenced object. </summary>
-        public string MediaType { get; }
-        /// <summary> The number of bytes of the content. Same as Length field. </summary>
-        public long? Size { get; }
-        /// <summary> The digest of the content, as defined by the Registry V2 HTTP API Specification. </summary>
-        public string Digest { get; }
-        /// <summary> The number of bytes of the content. Same as Size field. </summary>
-        public long? Length { get; }
-        /// <summary> The repository name. </summary>
-        public string Repository { get; }
-        /// <summary> The direct URL to the content. </summary>
-        public string Url { get; }
-        /// <summary> The tag name. </summary>
-        public string Tag { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImageDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImageDeletedEventData.Serialization.cs
deleted file mode 100644
index 2317c3678deb..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImageDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryImageDeletedEventData : IUtf8JsonSerializable, IJsonModel<ContainerRegistryImageDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryImageDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryImageDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryImageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryImageDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerRegistryImageDeletedEventData IJsonModel<ContainerRegistryImageDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryImageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryImageDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryImageDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryImageDeletedEventData DeserializeContainerRegistryImageDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            DateTimeOffset timestamp = default;
-            string action = default;
-            string location = default;
-            ContainerRegistryEventTarget target = default;
-            ContainerRegistryEventRequest request = default;
-            ContainerRegistryEventActor actor = default;
-            ContainerRegistryEventSource source = default;
-            ContainerRegistryEventConnectedRegistry connectedRegistry = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("action"u8))
-                {
-                    action = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("location"u8))
-                {
-                    location = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("target"u8))
-                {
-                    target = ContainerRegistryEventTarget.DeserializeContainerRegistryEventTarget(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("request"u8))
-                {
-                    request = ContainerRegistryEventRequest.DeserializeContainerRegistryEventRequest(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("actor"u8))
-                {
-                    actor = ContainerRegistryEventActor.DeserializeContainerRegistryEventActor(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("source"u8))
-                {
-                    source = ContainerRegistryEventSource.DeserializeContainerRegistryEventSource(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("connectedRegistry"u8))
-                {
-                    connectedRegistry = ContainerRegistryEventConnectedRegistry.DeserializeContainerRegistryEventConnectedRegistry(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryImageDeletedEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                request,
-                actor,
-                source,
-                connectedRegistry,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryImageDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryImageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryImageDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryImageDeletedEventData IPersistableModel<ContainerRegistryImageDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryImageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryImageDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryImageDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryImageDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerRegistryImageDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryImageDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImageDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImageDeletedEventData.cs
deleted file mode 100644
index c839e9590b91..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImageDeletedEventData.cs
+++ /dev/null
@@ -1,53 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerRegistry.ImageDeleted event. </summary>
-    public partial class ContainerRegistryImageDeletedEventData : ContainerRegistryEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryImageDeletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="target"/>, <paramref name="request"/>, <paramref name="actor"/>, <paramref name="source"/> or <paramref name="connectedRegistry"/> is null. </exception>
-        internal ContainerRegistryImageDeletedEventData(DateTimeOffset timestamp, ContainerRegistryEventTarget target, ContainerRegistryEventRequest request, ContainerRegistryEventActor actor, ContainerRegistryEventSource source, ContainerRegistryEventConnectedRegistry connectedRegistry) : base(timestamp, target, request, actor, source, connectedRegistry)
-        {
-            Argument.AssertNotNull(target, nameof(target));
-            Argument.AssertNotNull(request, nameof(request));
-            Argument.AssertNotNull(actor, nameof(actor));
-            Argument.AssertNotNull(source, nameof(source));
-            Argument.AssertNotNull(connectedRegistry, nameof(connectedRegistry));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryImageDeletedEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryImageDeletedEventData(string id, DateTimeOffset timestamp, string action, string location, ContainerRegistryEventTarget target, ContainerRegistryEventRequest request, ContainerRegistryEventActor actor, ContainerRegistryEventSource source, ContainerRegistryEventConnectedRegistry connectedRegistry, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, timestamp, action, location, target, request, actor, source, connectedRegistry, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryImageDeletedEventData"/> for deserialization. </summary>
-        internal ContainerRegistryImageDeletedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImagePushedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImagePushedEventData.Serialization.cs
deleted file mode 100644
index 99f3256056db..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImagePushedEventData.Serialization.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerRegistryImagePushedEventData : IUtf8JsonSerializable, IJsonModel<ContainerRegistryImagePushedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerRegistryImagePushedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerRegistryImagePushedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryImagePushedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryImagePushedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerRegistryImagePushedEventData IJsonModel<ContainerRegistryImagePushedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryImagePushedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerRegistryImagePushedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerRegistryImagePushedEventData(document.RootElement, options);
-        }
-
-        internal static ContainerRegistryImagePushedEventData DeserializeContainerRegistryImagePushedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            DateTimeOffset timestamp = default;
-            string action = default;
-            string location = default;
-            ContainerRegistryEventTarget target = default;
-            ContainerRegistryEventRequest request = default;
-            ContainerRegistryEventActor actor = default;
-            ContainerRegistryEventSource source = default;
-            ContainerRegistryEventConnectedRegistry connectedRegistry = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("action"u8))
-                {
-                    action = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("location"u8))
-                {
-                    location = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("target"u8))
-                {
-                    target = ContainerRegistryEventTarget.DeserializeContainerRegistryEventTarget(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("request"u8))
-                {
-                    request = ContainerRegistryEventRequest.DeserializeContainerRegistryEventRequest(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("actor"u8))
-                {
-                    actor = ContainerRegistryEventActor.DeserializeContainerRegistryEventActor(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("source"u8))
-                {
-                    source = ContainerRegistryEventSource.DeserializeContainerRegistryEventSource(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("connectedRegistry"u8))
-                {
-                    connectedRegistry = ContainerRegistryEventConnectedRegistry.DeserializeContainerRegistryEventConnectedRegistry(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerRegistryImagePushedEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                request,
-                actor,
-                source,
-                connectedRegistry,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerRegistryImagePushedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryImagePushedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryImagePushedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerRegistryImagePushedEventData IPersistableModel<ContainerRegistryImagePushedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerRegistryImagePushedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerRegistryImagePushedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerRegistryImagePushedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerRegistryImagePushedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerRegistryImagePushedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerRegistryImagePushedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImagePushedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImagePushedEventData.cs
deleted file mode 100644
index 32fbf481e6df..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerRegistryImagePushedEventData.cs
+++ /dev/null
@@ -1,53 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerRegistry.ImagePushed event. </summary>
-    public partial class ContainerRegistryImagePushedEventData : ContainerRegistryEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryImagePushedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="target"/>, <paramref name="request"/>, <paramref name="actor"/>, <paramref name="source"/> or <paramref name="connectedRegistry"/> is null. </exception>
-        internal ContainerRegistryImagePushedEventData(DateTimeOffset timestamp, ContainerRegistryEventTarget target, ContainerRegistryEventRequest request, ContainerRegistryEventActor actor, ContainerRegistryEventSource source, ContainerRegistryEventConnectedRegistry connectedRegistry) : base(timestamp, target, request, actor, source, connectedRegistry)
-        {
-            Argument.AssertNotNull(target, nameof(target));
-            Argument.AssertNotNull(request, nameof(request));
-            Argument.AssertNotNull(actor, nameof(actor));
-            Argument.AssertNotNull(source, nameof(source));
-            Argument.AssertNotNull(connectedRegistry, nameof(connectedRegistry));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryImagePushedEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerRegistryImagePushedEventData(string id, DateTimeOffset timestamp, string action, string location, ContainerRegistryEventTarget target, ContainerRegistryEventRequest request, ContainerRegistryEventActor actor, ContainerRegistryEventSource source, ContainerRegistryEventConnectedRegistry connectedRegistry, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, timestamp, action, location, target, request, actor, source, connectedRegistry, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerRegistryImagePushedEventData"/> for deserialization. </summary>
-        internal ContainerRegistryImagePushedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndedEventData.Serialization.cs
deleted file mode 100644
index da702ca3e31f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndedEventData.Serialization.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerServiceClusterSupportEndedEventData : IUtf8JsonSerializable, IJsonModel<ContainerServiceClusterSupportEndedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerServiceClusterSupportEndedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerServiceClusterSupportEndedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEndedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEndedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerServiceClusterSupportEndedEventData IJsonModel<ContainerServiceClusterSupportEndedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEndedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEndedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerServiceClusterSupportEndedEventData(document.RootElement, options);
-        }
-
-        internal static ContainerServiceClusterSupportEndedEventData DeserializeContainerServiceClusterSupportEndedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string kubernetesVersion = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("kubernetesVersion"u8))
-                {
-                    kubernetesVersion = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerServiceClusterSupportEndedEventData(kubernetesVersion, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerServiceClusterSupportEndedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEndedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEndedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerServiceClusterSupportEndedEventData IPersistableModel<ContainerServiceClusterSupportEndedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEndedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerServiceClusterSupportEndedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEndedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerServiceClusterSupportEndedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerServiceClusterSupportEndedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerServiceClusterSupportEndedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndedEventData.cs
deleted file mode 100644
index 66ed2b8c4b62..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndedEventData.cs
+++ /dev/null
@@ -1,28 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerService.ClusterSupportEnded event. </summary>
-    public partial class ContainerServiceClusterSupportEndedEventData : ContainerServiceClusterSupportEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceClusterSupportEndedEventData"/>. </summary>
-        internal ContainerServiceClusterSupportEndedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceClusterSupportEndedEventData"/>. </summary>
-        /// <param name="kubernetesVersion"> The Kubernetes version of the ManagedCluster resource. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerServiceClusterSupportEndedEventData(string kubernetesVersion, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(kubernetesVersion, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndingEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndingEventData.Serialization.cs
deleted file mode 100644
index db44b5ec660c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndingEventData.Serialization.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerServiceClusterSupportEndingEventData : IUtf8JsonSerializable, IJsonModel<ContainerServiceClusterSupportEndingEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerServiceClusterSupportEndingEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerServiceClusterSupportEndingEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEndingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEndingEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerServiceClusterSupportEndingEventData IJsonModel<ContainerServiceClusterSupportEndingEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEndingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEndingEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerServiceClusterSupportEndingEventData(document.RootElement, options);
-        }
-
-        internal static ContainerServiceClusterSupportEndingEventData DeserializeContainerServiceClusterSupportEndingEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string kubernetesVersion = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("kubernetesVersion"u8))
-                {
-                    kubernetesVersion = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerServiceClusterSupportEndingEventData(kubernetesVersion, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerServiceClusterSupportEndingEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEndingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEndingEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerServiceClusterSupportEndingEventData IPersistableModel<ContainerServiceClusterSupportEndingEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEndingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerServiceClusterSupportEndingEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEndingEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerServiceClusterSupportEndingEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerServiceClusterSupportEndingEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerServiceClusterSupportEndingEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndingEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndingEventData.cs
deleted file mode 100644
index 0a3fa362492c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEndingEventData.cs
+++ /dev/null
@@ -1,28 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerService.ClusterSupportEnding event. </summary>
-    public partial class ContainerServiceClusterSupportEndingEventData : ContainerServiceClusterSupportEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceClusterSupportEndingEventData"/>. </summary>
-        internal ContainerServiceClusterSupportEndingEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceClusterSupportEndingEventData"/>. </summary>
-        /// <param name="kubernetesVersion"> The Kubernetes version of the ManagedCluster resource. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerServiceClusterSupportEndingEventData(string kubernetesVersion, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(kubernetesVersion, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEventData.Serialization.cs
deleted file mode 100644
index 48a01092b872..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerServiceClusterSupportEventData : IUtf8JsonSerializable, IJsonModel<ContainerServiceClusterSupportEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerServiceClusterSupportEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerServiceClusterSupportEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(KubernetesVersion))
-            {
-                writer.WritePropertyName("kubernetesVersion"u8);
-                writer.WriteStringValue(KubernetesVersion);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerServiceClusterSupportEventData IJsonModel<ContainerServiceClusterSupportEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerServiceClusterSupportEventData(document.RootElement, options);
-        }
-
-        internal static ContainerServiceClusterSupportEventData DeserializeContainerServiceClusterSupportEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string kubernetesVersion = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("kubernetesVersion"u8))
-                {
-                    kubernetesVersion = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerServiceClusterSupportEventData(kubernetesVersion, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerServiceClusterSupportEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerServiceClusterSupportEventData IPersistableModel<ContainerServiceClusterSupportEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceClusterSupportEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerServiceClusterSupportEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceClusterSupportEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerServiceClusterSupportEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerServiceClusterSupportEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerServiceClusterSupportEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEventData.cs
deleted file mode 100644
index 3ad05c8cb79b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceClusterSupportEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of cluster support events. </summary>
-    public partial class ContainerServiceClusterSupportEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceClusterSupportEventData"/>. </summary>
-        internal ContainerServiceClusterSupportEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceClusterSupportEventData"/>. </summary>
-        /// <param name="kubernetesVersion"> The Kubernetes version of the ManagedCluster resource. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerServiceClusterSupportEventData(string kubernetesVersion, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            KubernetesVersion = kubernetesVersion;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The Kubernetes version of the ManagedCluster resource. </summary>
-        public string KubernetesVersion { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNewKubernetesVersionAvailableEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNewKubernetesVersionAvailableEventData.Serialization.cs
deleted file mode 100644
index 8836e65a21e0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNewKubernetesVersionAvailableEventData.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerServiceNewKubernetesVersionAvailableEventData : IUtf8JsonSerializable, IJsonModel<ContainerServiceNewKubernetesVersionAvailableEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerServiceNewKubernetesVersionAvailableEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerServiceNewKubernetesVersionAvailableEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNewKubernetesVersionAvailableEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNewKubernetesVersionAvailableEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(LatestSupportedKubernetesVersion))
-            {
-                writer.WritePropertyName("latestSupportedKubernetesVersion"u8);
-                writer.WriteStringValue(LatestSupportedKubernetesVersion);
-            }
-            if (Optional.IsDefined(LatestStableKubernetesVersion))
-            {
-                writer.WritePropertyName("latestStableKubernetesVersion"u8);
-                writer.WriteStringValue(LatestStableKubernetesVersion);
-            }
-            if (Optional.IsDefined(LowestMinorKubernetesVersion))
-            {
-                writer.WritePropertyName("lowestMinorKubernetesVersion"u8);
-                writer.WriteStringValue(LowestMinorKubernetesVersion);
-            }
-            if (Optional.IsDefined(LatestPreviewKubernetesVersion))
-            {
-                writer.WritePropertyName("latestPreviewKubernetesVersion"u8);
-                writer.WriteStringValue(LatestPreviewKubernetesVersion);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerServiceNewKubernetesVersionAvailableEventData IJsonModel<ContainerServiceNewKubernetesVersionAvailableEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNewKubernetesVersionAvailableEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNewKubernetesVersionAvailableEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerServiceNewKubernetesVersionAvailableEventData(document.RootElement, options);
-        }
-
-        internal static ContainerServiceNewKubernetesVersionAvailableEventData DeserializeContainerServiceNewKubernetesVersionAvailableEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string latestSupportedKubernetesVersion = default;
-            string latestStableKubernetesVersion = default;
-            string lowestMinorKubernetesVersion = default;
-            string latestPreviewKubernetesVersion = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("latestSupportedKubernetesVersion"u8))
-                {
-                    latestSupportedKubernetesVersion = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("latestStableKubernetesVersion"u8))
-                {
-                    latestStableKubernetesVersion = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("lowestMinorKubernetesVersion"u8))
-                {
-                    lowestMinorKubernetesVersion = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("latestPreviewKubernetesVersion"u8))
-                {
-                    latestPreviewKubernetesVersion = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerServiceNewKubernetesVersionAvailableEventData(latestSupportedKubernetesVersion, latestStableKubernetesVersion, lowestMinorKubernetesVersion, latestPreviewKubernetesVersion, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerServiceNewKubernetesVersionAvailableEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNewKubernetesVersionAvailableEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNewKubernetesVersionAvailableEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerServiceNewKubernetesVersionAvailableEventData IPersistableModel<ContainerServiceNewKubernetesVersionAvailableEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNewKubernetesVersionAvailableEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerServiceNewKubernetesVersionAvailableEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNewKubernetesVersionAvailableEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerServiceNewKubernetesVersionAvailableEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerServiceNewKubernetesVersionAvailableEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerServiceNewKubernetesVersionAvailableEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNewKubernetesVersionAvailableEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNewKubernetesVersionAvailableEventData.cs
deleted file mode 100644
index a220ba99996e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNewKubernetesVersionAvailableEventData.cs
+++ /dev/null
@@ -1,77 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerService.NewKubernetesVersionAvailable event. </summary>
-    public partial class ContainerServiceNewKubernetesVersionAvailableEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNewKubernetesVersionAvailableEventData"/>. </summary>
-        internal ContainerServiceNewKubernetesVersionAvailableEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNewKubernetesVersionAvailableEventData"/>. </summary>
-        /// <param name="latestSupportedKubernetesVersion"> The highest PATCH Kubernetes version for the highest MINOR version supported by ManagedCluster resource. </param>
-        /// <param name="latestStableKubernetesVersion"> The highest PATCH Kubernetes version for the MINOR version considered stable for the ManagedCluster resource. </param>
-        /// <param name="lowestMinorKubernetesVersion"> The highest PATCH Kubernetes version for the lowest applicable MINOR version available for the ManagedCluster resource. </param>
-        /// <param name="latestPreviewKubernetesVersion"> The highest PATCH Kubernetes version considered preview for the ManagedCluster resource. There might not be any version in preview at the time of publishing the event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerServiceNewKubernetesVersionAvailableEventData(string latestSupportedKubernetesVersion, string latestStableKubernetesVersion, string lowestMinorKubernetesVersion, string latestPreviewKubernetesVersion, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            LatestSupportedKubernetesVersion = latestSupportedKubernetesVersion;
-            LatestStableKubernetesVersion = latestStableKubernetesVersion;
-            LowestMinorKubernetesVersion = lowestMinorKubernetesVersion;
-            LatestPreviewKubernetesVersion = latestPreviewKubernetesVersion;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The highest PATCH Kubernetes version for the highest MINOR version supported by ManagedCluster resource. </summary>
-        public string LatestSupportedKubernetesVersion { get; }
-        /// <summary> The highest PATCH Kubernetes version for the MINOR version considered stable for the ManagedCluster resource. </summary>
-        public string LatestStableKubernetesVersion { get; }
-        /// <summary> The highest PATCH Kubernetes version for the lowest applicable MINOR version available for the ManagedCluster resource. </summary>
-        public string LowestMinorKubernetesVersion { get; }
-        /// <summary> The highest PATCH Kubernetes version considered preview for the ManagedCluster resource. There might not be any version in preview at the time of publishing the event. </summary>
-        public string LatestPreviewKubernetesVersion { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingEventData.Serialization.cs
deleted file mode 100644
index a27699c1016e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerServiceNodePoolRollingEventData : IUtf8JsonSerializable, IJsonModel<ContainerServiceNodePoolRollingEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerServiceNodePoolRollingEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerServiceNodePoolRollingEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(NodePoolName))
-            {
-                writer.WritePropertyName("nodePoolName"u8);
-                writer.WriteStringValue(NodePoolName);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ContainerServiceNodePoolRollingEventData IJsonModel<ContainerServiceNodePoolRollingEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerServiceNodePoolRollingEventData(document.RootElement, options);
-        }
-
-        internal static ContainerServiceNodePoolRollingEventData DeserializeContainerServiceNodePoolRollingEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string nodePoolName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("nodePoolName"u8))
-                {
-                    nodePoolName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerServiceNodePoolRollingEventData(nodePoolName, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerServiceNodePoolRollingEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerServiceNodePoolRollingEventData IPersistableModel<ContainerServiceNodePoolRollingEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerServiceNodePoolRollingEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerServiceNodePoolRollingEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ContainerServiceNodePoolRollingEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerServiceNodePoolRollingEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingEventData.cs
deleted file mode 100644
index 3b5580803572..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingEventData.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of common properties of node pool rolling events. </summary>
-    public partial class ContainerServiceNodePoolRollingEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNodePoolRollingEventData"/>. </summary>
-        internal ContainerServiceNodePoolRollingEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNodePoolRollingEventData"/>. </summary>
-        /// <param name="nodePoolName"> The name of the node pool in the ManagedCluster resource. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerServiceNodePoolRollingEventData(string nodePoolName, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            NodePoolName = nodePoolName;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The name of the node pool in the ManagedCluster resource. </summary>
-        public string NodePoolName { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingFailedEventData.Serialization.cs
deleted file mode 100644
index 82cb9599f2c7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerServiceNodePoolRollingFailedEventData : IUtf8JsonSerializable, IJsonModel<ContainerServiceNodePoolRollingFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerServiceNodePoolRollingFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerServiceNodePoolRollingFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerServiceNodePoolRollingFailedEventData IJsonModel<ContainerServiceNodePoolRollingFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerServiceNodePoolRollingFailedEventData(document.RootElement, options);
-        }
-
-        internal static ContainerServiceNodePoolRollingFailedEventData DeserializeContainerServiceNodePoolRollingFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string nodePoolName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("nodePoolName"u8))
-                {
-                    nodePoolName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerServiceNodePoolRollingFailedEventData(nodePoolName, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerServiceNodePoolRollingFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerServiceNodePoolRollingFailedEventData IPersistableModel<ContainerServiceNodePoolRollingFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerServiceNodePoolRollingFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerServiceNodePoolRollingFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerServiceNodePoolRollingFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerServiceNodePoolRollingFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingFailedEventData.cs
deleted file mode 100644
index 0bf9331c72ca..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingFailedEventData.cs
+++ /dev/null
@@ -1,28 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerService.NodePoolRollingFailed event. </summary>
-    public partial class ContainerServiceNodePoolRollingFailedEventData : ContainerServiceNodePoolRollingEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNodePoolRollingFailedEventData"/>. </summary>
-        internal ContainerServiceNodePoolRollingFailedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNodePoolRollingFailedEventData"/>. </summary>
-        /// <param name="nodePoolName"> The name of the node pool in the ManagedCluster resource. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerServiceNodePoolRollingFailedEventData(string nodePoolName, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(nodePoolName, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingStartedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingStartedEventData.Serialization.cs
deleted file mode 100644
index 5ce556b9cfdf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingStartedEventData.Serialization.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerServiceNodePoolRollingStartedEventData : IUtf8JsonSerializable, IJsonModel<ContainerServiceNodePoolRollingStartedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerServiceNodePoolRollingStartedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerServiceNodePoolRollingStartedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingStartedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerServiceNodePoolRollingStartedEventData IJsonModel<ContainerServiceNodePoolRollingStartedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingStartedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerServiceNodePoolRollingStartedEventData(document.RootElement, options);
-        }
-
-        internal static ContainerServiceNodePoolRollingStartedEventData DeserializeContainerServiceNodePoolRollingStartedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string nodePoolName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("nodePoolName"u8))
-                {
-                    nodePoolName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerServiceNodePoolRollingStartedEventData(nodePoolName, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerServiceNodePoolRollingStartedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingStartedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerServiceNodePoolRollingStartedEventData IPersistableModel<ContainerServiceNodePoolRollingStartedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerServiceNodePoolRollingStartedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingStartedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerServiceNodePoolRollingStartedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerServiceNodePoolRollingStartedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerServiceNodePoolRollingStartedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingStartedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingStartedEventData.cs
deleted file mode 100644
index 88958ee63eef..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingStartedEventData.cs
+++ /dev/null
@@ -1,28 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerService.NodePoolRollingStarted event. </summary>
-    public partial class ContainerServiceNodePoolRollingStartedEventData : ContainerServiceNodePoolRollingEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNodePoolRollingStartedEventData"/>. </summary>
-        internal ContainerServiceNodePoolRollingStartedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNodePoolRollingStartedEventData"/>. </summary>
-        /// <param name="nodePoolName"> The name of the node pool in the ManagedCluster resource. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerServiceNodePoolRollingStartedEventData(string nodePoolName, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(nodePoolName, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingSucceededEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingSucceededEventData.Serialization.cs
deleted file mode 100644
index e7b4799f29cf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingSucceededEventData.Serialization.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ContainerServiceNodePoolRollingSucceededEventData : IUtf8JsonSerializable, IJsonModel<ContainerServiceNodePoolRollingSucceededEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContainerServiceNodePoolRollingSucceededEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ContainerServiceNodePoolRollingSucceededEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingSucceededEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingSucceededEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ContainerServiceNodePoolRollingSucceededEventData IJsonModel<ContainerServiceNodePoolRollingSucceededEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingSucceededEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingSucceededEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContainerServiceNodePoolRollingSucceededEventData(document.RootElement, options);
-        }
-
-        internal static ContainerServiceNodePoolRollingSucceededEventData DeserializeContainerServiceNodePoolRollingSucceededEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string nodePoolName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("nodePoolName"u8))
-                {
-                    nodePoolName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContainerServiceNodePoolRollingSucceededEventData(nodePoolName, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContainerServiceNodePoolRollingSucceededEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingSucceededEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingSucceededEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContainerServiceNodePoolRollingSucceededEventData IPersistableModel<ContainerServiceNodePoolRollingSucceededEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContainerServiceNodePoolRollingSucceededEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContainerServiceNodePoolRollingSucceededEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContainerServiceNodePoolRollingSucceededEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContainerServiceNodePoolRollingSucceededEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ContainerServiceNodePoolRollingSucceededEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContainerServiceNodePoolRollingSucceededEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingSucceededEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingSucceededEventData.cs
deleted file mode 100644
index 18c9e4ada789..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ContainerServiceNodePoolRollingSucceededEventData.cs
+++ /dev/null
@@ -1,28 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ContainerService.NodePoolRollingSucceeded event. </summary>
-    public partial class ContainerServiceNodePoolRollingSucceededEventData : ContainerServiceNodePoolRollingEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNodePoolRollingSucceededEventData"/>. </summary>
-        internal ContainerServiceNodePoolRollingSucceededEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContainerServiceNodePoolRollingSucceededEventData"/>. </summary>
-        /// <param name="nodePoolName"> The name of the node pool in the ManagedCluster resource. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContainerServiceNodePoolRollingSucceededEventData(string nodePoolName, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(nodePoolName, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyCompletedEventData.Serialization.cs
deleted file mode 100644
index 48825fb0fed9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DataBoxCopyCompletedEventData : IUtf8JsonSerializable, IJsonModel<DataBoxCopyCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DataBoxCopyCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DataBoxCopyCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxCopyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataBoxCopyCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(SerialNumber))
-            {
-                writer.WritePropertyName("serialNumber"u8);
-                writer.WriteStringValue(SerialNumber);
-            }
-            writer.WritePropertyName("stageName"u8);
-            writer.WriteStringValue(StageName.ToString());
-            writer.WritePropertyName("stageTime"u8);
-            writer.WriteStringValue(StageTime, "O");
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DataBoxCopyCompletedEventData IJsonModel<DataBoxCopyCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxCopyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataBoxCopyCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDataBoxCopyCompletedEventData(document.RootElement, options);
-        }
-
-        internal static DataBoxCopyCompletedEventData DeserializeDataBoxCopyCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string serialNumber = default;
-            DataBoxStageName stageName = default;
-            DateTimeOffset stageTime = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("serialNumber"u8))
-                {
-                    serialNumber = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("stageName"u8))
-                {
-                    stageName = new DataBoxStageName(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("stageTime"u8))
-                {
-                    stageTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DataBoxCopyCompletedEventData(serialNumber, stageName, stageTime, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DataBoxCopyCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxCopyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DataBoxCopyCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DataBoxCopyCompletedEventData IPersistableModel<DataBoxCopyCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxCopyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDataBoxCopyCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DataBoxCopyCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DataBoxCopyCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DataBoxCopyCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDataBoxCopyCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyCompletedEventData.cs
deleted file mode 100644
index 75a73c0475e9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyCompletedEventData.cs
+++ /dev/null
@@ -1,82 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.DataBox.CopyCompleted event. </summary>
-    public partial class DataBoxCopyCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxCopyCompletedEventData"/>. </summary>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        internal DataBoxCopyCompletedEventData(DataBoxStageName stageName, DateTimeOffset stageTime)
-        {
-            StageName = stageName;
-            StageTime = stageTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxCopyCompletedEventData"/>. </summary>
-        /// <param name="serialNumber"> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </param>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DataBoxCopyCompletedEventData(string serialNumber, DataBoxStageName stageName, DateTimeOffset stageTime, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            SerialNumber = serialNumber;
-            StageName = stageName;
-            StageTime = stageTime;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxCopyCompletedEventData"/> for deserialization. </summary>
-        internal DataBoxCopyCompletedEventData()
-        {
-        }
-
-        /// <summary> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </summary>
-        public string SerialNumber { get; }
-        /// <summary> Name of the current Stage. </summary>
-        public DataBoxStageName StageName { get; }
-        /// <summary> The time at which the stage happened. </summary>
-        public DateTimeOffset StageTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyStartedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyStartedEventData.Serialization.cs
deleted file mode 100644
index e0603dee3265..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyStartedEventData.Serialization.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DataBoxCopyStartedEventData : IUtf8JsonSerializable, IJsonModel<DataBoxCopyStartedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DataBoxCopyStartedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DataBoxCopyStartedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxCopyStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataBoxCopyStartedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(SerialNumber))
-            {
-                writer.WritePropertyName("serialNumber"u8);
-                writer.WriteStringValue(SerialNumber);
-            }
-            writer.WritePropertyName("stageName"u8);
-            writer.WriteStringValue(StageName.ToString());
-            writer.WritePropertyName("stageTime"u8);
-            writer.WriteStringValue(StageTime, "O");
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DataBoxCopyStartedEventData IJsonModel<DataBoxCopyStartedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxCopyStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataBoxCopyStartedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDataBoxCopyStartedEventData(document.RootElement, options);
-        }
-
-        internal static DataBoxCopyStartedEventData DeserializeDataBoxCopyStartedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string serialNumber = default;
-            DataBoxStageName stageName = default;
-            DateTimeOffset stageTime = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("serialNumber"u8))
-                {
-                    serialNumber = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("stageName"u8))
-                {
-                    stageName = new DataBoxStageName(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("stageTime"u8))
-                {
-                    stageTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DataBoxCopyStartedEventData(serialNumber, stageName, stageTime, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DataBoxCopyStartedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxCopyStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DataBoxCopyStartedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DataBoxCopyStartedEventData IPersistableModel<DataBoxCopyStartedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxCopyStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDataBoxCopyStartedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DataBoxCopyStartedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DataBoxCopyStartedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DataBoxCopyStartedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDataBoxCopyStartedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyStartedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyStartedEventData.cs
deleted file mode 100644
index 2c607fcec991..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxCopyStartedEventData.cs
+++ /dev/null
@@ -1,82 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.DataBox.CopyStarted event. </summary>
-    public partial class DataBoxCopyStartedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxCopyStartedEventData"/>. </summary>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        internal DataBoxCopyStartedEventData(DataBoxStageName stageName, DateTimeOffset stageTime)
-        {
-            StageName = stageName;
-            StageTime = stageTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxCopyStartedEventData"/>. </summary>
-        /// <param name="serialNumber"> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </param>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DataBoxCopyStartedEventData(string serialNumber, DataBoxStageName stageName, DateTimeOffset stageTime, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            SerialNumber = serialNumber;
-            StageName = stageName;
-            StageTime = stageTime;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxCopyStartedEventData"/> for deserialization. </summary>
-        internal DataBoxCopyStartedEventData()
-        {
-        }
-
-        /// <summary> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </summary>
-        public string SerialNumber { get; }
-        /// <summary> Name of the current Stage. </summary>
-        public DataBoxStageName StageName { get; }
-        /// <summary> The time at which the stage happened. </summary>
-        public DateTimeOffset StageTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxOrderCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxOrderCompletedEventData.Serialization.cs
deleted file mode 100644
index 036c53c1f5ca..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxOrderCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DataBoxOrderCompletedEventData : IUtf8JsonSerializable, IJsonModel<DataBoxOrderCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DataBoxOrderCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DataBoxOrderCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxOrderCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataBoxOrderCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(SerialNumber))
-            {
-                writer.WritePropertyName("serialNumber"u8);
-                writer.WriteStringValue(SerialNumber);
-            }
-            writer.WritePropertyName("stageName"u8);
-            writer.WriteStringValue(StageName.ToString());
-            writer.WritePropertyName("stageTime"u8);
-            writer.WriteStringValue(StageTime, "O");
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DataBoxOrderCompletedEventData IJsonModel<DataBoxOrderCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxOrderCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataBoxOrderCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDataBoxOrderCompletedEventData(document.RootElement, options);
-        }
-
-        internal static DataBoxOrderCompletedEventData DeserializeDataBoxOrderCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string serialNumber = default;
-            DataBoxStageName stageName = default;
-            DateTimeOffset stageTime = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("serialNumber"u8))
-                {
-                    serialNumber = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("stageName"u8))
-                {
-                    stageName = new DataBoxStageName(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("stageTime"u8))
-                {
-                    stageTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DataBoxOrderCompletedEventData(serialNumber, stageName, stageTime, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DataBoxOrderCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxOrderCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DataBoxOrderCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DataBoxOrderCompletedEventData IPersistableModel<DataBoxOrderCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataBoxOrderCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDataBoxOrderCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DataBoxOrderCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DataBoxOrderCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DataBoxOrderCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDataBoxOrderCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxOrderCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxOrderCompletedEventData.cs
deleted file mode 100644
index b610d5819b26..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxOrderCompletedEventData.cs
+++ /dev/null
@@ -1,82 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.DataBox.OrderCompleted event. </summary>
-    public partial class DataBoxOrderCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxOrderCompletedEventData"/>. </summary>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        internal DataBoxOrderCompletedEventData(DataBoxStageName stageName, DateTimeOffset stageTime)
-        {
-            StageName = stageName;
-            StageTime = stageTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxOrderCompletedEventData"/>. </summary>
-        /// <param name="serialNumber"> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </param>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DataBoxOrderCompletedEventData(string serialNumber, DataBoxStageName stageName, DateTimeOffset stageTime, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            SerialNumber = serialNumber;
-            StageName = stageName;
-            StageTime = stageTime;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxOrderCompletedEventData"/> for deserialization. </summary>
-        internal DataBoxOrderCompletedEventData()
-        {
-        }
-
-        /// <summary> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </summary>
-        public string SerialNumber { get; }
-        /// <summary> Name of the current Stage. </summary>
-        public DataBoxStageName StageName { get; }
-        /// <summary> The time at which the stage happened. </summary>
-        public DateTimeOffset StageTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxStageName.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxStageName.cs
deleted file mode 100644
index e96f0f477c10..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DataBoxStageName.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of DataBox Stage Name enumeration. </summary>
-    public readonly partial struct DataBoxStageName : IEquatable<DataBoxStageName>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="DataBoxStageName"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public DataBoxStageName(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string CopyStartedValue = "CopyStarted";
-        private const string CopyCompletedValue = "CopyCompleted";
-        private const string OrderCompletedValue = "OrderCompleted";
-
-        /// <summary> Copy has started. </summary>
-        public static DataBoxStageName CopyStarted { get; } = new DataBoxStageName(CopyStartedValue);
-        /// <summary> Copy has completed. </summary>
-        public static DataBoxStageName CopyCompleted { get; } = new DataBoxStageName(CopyCompletedValue);
-        /// <summary> Order has been completed. </summary>
-        public static DataBoxStageName OrderCompleted { get; } = new DataBoxStageName(OrderCompletedValue);
-        /// <summary> Determines if two <see cref="DataBoxStageName"/> values are the same. </summary>
-        public static bool operator ==(DataBoxStageName left, DataBoxStageName right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="DataBoxStageName"/> values are not the same. </summary>
-        public static bool operator !=(DataBoxStageName left, DataBoxStageName right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="DataBoxStageName"/>. </summary>
-        public static implicit operator DataBoxStageName(string value) => new DataBoxStageName(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is DataBoxStageName other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(DataBoxStageName other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventInfo.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventInfo.Serialization.cs
deleted file mode 100644
index e5f7910703dc..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventInfo.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceConnectionStateEventInfo : IUtf8JsonSerializable, IJsonModel<DeviceConnectionStateEventInfo>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceConnectionStateEventInfo>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceConnectionStateEventInfo>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceConnectionStateEventInfo>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceConnectionStateEventInfo)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(SequenceNumber))
-            {
-                writer.WritePropertyName("sequenceNumber"u8);
-                writer.WriteStringValue(SequenceNumber);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceConnectionStateEventInfo IJsonModel<DeviceConnectionStateEventInfo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceConnectionStateEventInfo>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceConnectionStateEventInfo)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceConnectionStateEventInfo(document.RootElement, options);
-        }
-
-        internal static DeviceConnectionStateEventInfo DeserializeDeviceConnectionStateEventInfo(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string sequenceNumber = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("sequenceNumber"u8))
-                {
-                    sequenceNumber = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceConnectionStateEventInfo(sequenceNumber, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceConnectionStateEventInfo>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceConnectionStateEventInfo>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceConnectionStateEventInfo)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceConnectionStateEventInfo IPersistableModel<DeviceConnectionStateEventInfo>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceConnectionStateEventInfo>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceConnectionStateEventInfo(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceConnectionStateEventInfo)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceConnectionStateEventInfo>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceConnectionStateEventInfo FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceConnectionStateEventInfo(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventInfo.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventInfo.cs
deleted file mode 100644
index 215ec30e9369..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventInfo.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Information about the device connection state event. </summary>
-    public partial class DeviceConnectionStateEventInfo
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceConnectionStateEventInfo"/>. </summary>
-        internal DeviceConnectionStateEventInfo()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceConnectionStateEventInfo"/>. </summary>
-        /// <param name="sequenceNumber"> Sequence number is string representation of a hexadecimal number. string compare can be used to identify the larger number because both in ASCII and HEX numbers come after alphabets. If you are converting the string to hex, then the number is a 256 bit number. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceConnectionStateEventInfo(string sequenceNumber, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            SequenceNumber = sequenceNumber;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Sequence number is string representation of a hexadecimal number. string compare can be used to identify the larger number because both in ASCII and HEX numbers come after alphabets. If you are converting the string to hex, then the number is a 256 bit number. </summary>
-        public string SequenceNumber { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventProperties.Serialization.cs
deleted file mode 100644
index f281e719035a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventProperties.Serialization.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceConnectionStateEventProperties : IUtf8JsonSerializable, IJsonModel<DeviceConnectionStateEventProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceConnectionStateEventProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceConnectionStateEventProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceConnectionStateEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceConnectionStateEventProperties)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(DeviceId))
-            {
-                writer.WritePropertyName("deviceId"u8);
-                writer.WriteStringValue(DeviceId);
-            }
-            if (Optional.IsDefined(ModuleId))
-            {
-                writer.WritePropertyName("moduleId"u8);
-                writer.WriteStringValue(ModuleId);
-            }
-            if (Optional.IsDefined(HubName))
-            {
-                writer.WritePropertyName("hubName"u8);
-                writer.WriteStringValue(HubName);
-            }
-            writer.WritePropertyName("deviceConnectionStateEventInfo"u8);
-            writer.WriteObjectValue(DeviceConnectionStateEventInfo, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceConnectionStateEventProperties IJsonModel<DeviceConnectionStateEventProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceConnectionStateEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceConnectionStateEventProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceConnectionStateEventProperties(document.RootElement, options);
-        }
-
-        internal static DeviceConnectionStateEventProperties DeserializeDeviceConnectionStateEventProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deviceId = default;
-            string moduleId = default;
-            string hubName = default;
-            DeviceConnectionStateEventInfo deviceConnectionStateEventInfo = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deviceId"u8))
-                {
-                    deviceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("moduleId"u8))
-                {
-                    moduleId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("hubName"u8))
-                {
-                    hubName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("deviceConnectionStateEventInfo"u8))
-                {
-                    deviceConnectionStateEventInfo = DeviceConnectionStateEventInfo.DeserializeDeviceConnectionStateEventInfo(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceConnectionStateEventProperties(deviceId, moduleId, hubName, deviceConnectionStateEventInfo, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceConnectionStateEventProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceConnectionStateEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceConnectionStateEventProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceConnectionStateEventProperties IPersistableModel<DeviceConnectionStateEventProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceConnectionStateEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceConnectionStateEventProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceConnectionStateEventProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceConnectionStateEventProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceConnectionStateEventProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceConnectionStateEventProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventProperties.cs
deleted file mode 100644
index d271d4d44c8c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceConnectionStateEventProperties.cs
+++ /dev/null
@@ -1,87 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a device connection state event (DeviceConnected, DeviceDisconnected). </summary>
-    public partial class DeviceConnectionStateEventProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceConnectionStateEventProperties"/>. </summary>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="deviceConnectionStateEventInfo"/> is null. </exception>
-        internal DeviceConnectionStateEventProperties(DeviceConnectionStateEventInfo deviceConnectionStateEventInfo)
-        {
-            Argument.AssertNotNull(deviceConnectionStateEventInfo, nameof(deviceConnectionStateEventInfo));
-
-            DeviceConnectionStateEventInfo = deviceConnectionStateEventInfo;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceConnectionStateEventProperties"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="moduleId"> The unique identifier of the module. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceConnectionStateEventProperties(string deviceId, string moduleId, string hubName, DeviceConnectionStateEventInfo deviceConnectionStateEventInfo, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            DeviceId = deviceId;
-            ModuleId = moduleId;
-            HubName = hubName;
-            DeviceConnectionStateEventInfo = deviceConnectionStateEventInfo;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceConnectionStateEventProperties"/> for deserialization. </summary>
-        internal DeviceConnectionStateEventProperties()
-        {
-        }
-
-        /// <summary> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </summary>
-        public string DeviceId { get; }
-        /// <summary> The unique identifier of the module. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </summary>
-        public string ModuleId { get; }
-        /// <summary> Name of the IoT Hub where the device was created or deleted. </summary>
-        public string HubName { get; }
-        /// <summary> Information about the device connection state event. </summary>
-        public DeviceConnectionStateEventInfo DeviceConnectionStateEventInfo { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceLifeCycleEventProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceLifeCycleEventProperties.Serialization.cs
deleted file mode 100644
index 067326794b32..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceLifeCycleEventProperties.Serialization.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceLifeCycleEventProperties : IUtf8JsonSerializable, IJsonModel<DeviceLifeCycleEventProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceLifeCycleEventProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceLifeCycleEventProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceLifeCycleEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceLifeCycleEventProperties)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(DeviceId))
-            {
-                writer.WritePropertyName("deviceId"u8);
-                writer.WriteStringValue(DeviceId);
-            }
-            if (Optional.IsDefined(HubName))
-            {
-                writer.WritePropertyName("hubName"u8);
-                writer.WriteStringValue(HubName);
-            }
-            writer.WritePropertyName("twin"u8);
-            writer.WriteObjectValue(Twin, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceLifeCycleEventProperties IJsonModel<DeviceLifeCycleEventProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceLifeCycleEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceLifeCycleEventProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceLifeCycleEventProperties(document.RootElement, options);
-        }
-
-        internal static DeviceLifeCycleEventProperties DeserializeDeviceLifeCycleEventProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deviceId = default;
-            string hubName = default;
-            DeviceTwinInfo twin = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deviceId"u8))
-                {
-                    deviceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("hubName"u8))
-                {
-                    hubName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("twin"u8))
-                {
-                    twin = DeviceTwinInfo.DeserializeDeviceTwinInfo(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceLifeCycleEventProperties(deviceId, hubName, twin, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceLifeCycleEventProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceLifeCycleEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceLifeCycleEventProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceLifeCycleEventProperties IPersistableModel<DeviceLifeCycleEventProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceLifeCycleEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceLifeCycleEventProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceLifeCycleEventProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceLifeCycleEventProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceLifeCycleEventProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceLifeCycleEventProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceLifeCycleEventProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceLifeCycleEventProperties.cs
deleted file mode 100644
index cb931023ce50..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceLifeCycleEventProperties.cs
+++ /dev/null
@@ -1,83 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a device life cycle event (DeviceCreated, DeviceDeleted). </summary>
-    public partial class DeviceLifeCycleEventProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceLifeCycleEventProperties"/>. </summary>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="twin"/> is null. </exception>
-        internal DeviceLifeCycleEventProperties(DeviceTwinInfo twin)
-        {
-            Argument.AssertNotNull(twin, nameof(twin));
-
-            Twin = twin;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceLifeCycleEventProperties"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceLifeCycleEventProperties(string deviceId, string hubName, DeviceTwinInfo twin, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            DeviceId = deviceId;
-            HubName = hubName;
-            Twin = twin;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceLifeCycleEventProperties"/> for deserialization. </summary>
-        internal DeviceLifeCycleEventProperties()
-        {
-        }
-
-        /// <summary> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </summary>
-        public string DeviceId { get; }
-        /// <summary> Name of the IoT Hub where the device was created or deleted. </summary>
-        public string HubName { get; }
-        /// <summary> Information about the device twin, which is the cloud representation of application device metadata. </summary>
-        public DeviceTwinInfo Twin { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTelemetryEventProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTelemetryEventProperties.Serialization.cs
deleted file mode 100644
index 8c040868a652..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTelemetryEventProperties.Serialization.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceTelemetryEventProperties : IUtf8JsonSerializable, IJsonModel<DeviceTelemetryEventProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceTelemetryEventProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceTelemetryEventProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTelemetryEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTelemetryEventProperties)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("body"u8);
-            writer.WriteStartObject();
-            foreach (var item in Body)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            foreach (var item in Properties)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("systemProperties"u8);
-            writer.WriteStartObject();
-            foreach (var item in SystemProperties)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceTelemetryEventProperties IJsonModel<DeviceTelemetryEventProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTelemetryEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTelemetryEventProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceTelemetryEventProperties(document.RootElement, options);
-        }
-
-        internal static DeviceTelemetryEventProperties DeserializeDeviceTelemetryEventProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyDictionary<string, BinaryData> body = default;
-            IReadOnlyDictionary<string, string> properties = default;
-            IReadOnlyDictionary<string, string> systemProperties = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("body"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    body = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    properties = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("systemProperties"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    systemProperties = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceTelemetryEventProperties(body, properties, systemProperties, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceTelemetryEventProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTelemetryEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTelemetryEventProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceTelemetryEventProperties IPersistableModel<DeviceTelemetryEventProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTelemetryEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceTelemetryEventProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTelemetryEventProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceTelemetryEventProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceTelemetryEventProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceTelemetryEventProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTelemetryEventProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTelemetryEventProperties.cs
deleted file mode 100644
index 8b142b83e7a6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTelemetryEventProperties.cs
+++ /dev/null
@@ -1,118 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a device telemetry event (DeviceTelemetry). </summary>
-    public partial class DeviceTelemetryEventProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTelemetryEventProperties"/>. </summary>
-        /// <param name="body"> The content of the message from the device. </param>
-        /// <param name="properties"> Application properties are user-defined strings that can be added to the message. These fields are optional. </param>
-        /// <param name="systemProperties"> System properties help identify contents and source of the messages. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="body"/>, <paramref name="properties"/> or <paramref name="systemProperties"/> is null. </exception>
-        internal DeviceTelemetryEventProperties(IReadOnlyDictionary<string, BinaryData> body, IReadOnlyDictionary<string, string> properties, IReadOnlyDictionary<string, string> systemProperties)
-        {
-            Argument.AssertNotNull(body, nameof(body));
-            Argument.AssertNotNull(properties, nameof(properties));
-            Argument.AssertNotNull(systemProperties, nameof(systemProperties));
-
-            Body = body;
-            Properties = properties;
-            SystemProperties = systemProperties;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTelemetryEventProperties"/>. </summary>
-        /// <param name="body"> The content of the message from the device. </param>
-        /// <param name="properties"> Application properties are user-defined strings that can be added to the message. These fields are optional. </param>
-        /// <param name="systemProperties"> System properties help identify contents and source of the messages. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceTelemetryEventProperties(IReadOnlyDictionary<string, BinaryData> body, IReadOnlyDictionary<string, string> properties, IReadOnlyDictionary<string, string> systemProperties, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Body = body;
-            Properties = properties;
-            SystemProperties = systemProperties;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTelemetryEventProperties"/> for deserialization. </summary>
-        internal DeviceTelemetryEventProperties()
-        {
-        }
-
-        /// <summary>
-        /// The content of the message from the device.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> Body { get; }
-        /// <summary> Application properties are user-defined strings that can be added to the message. These fields are optional. </summary>
-        public IReadOnlyDictionary<string, string> Properties { get; }
-        /// <summary> System properties help identify contents and source of the messages. </summary>
-        public IReadOnlyDictionary<string, string> SystemProperties { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfo.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfo.Serialization.cs
deleted file mode 100644
index e5d3ab3d59e6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfo.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceTwinInfo : IUtf8JsonSerializable, IJsonModel<DeviceTwinInfo>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceTwinInfo>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceTwinInfo>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfo>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinInfo)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(AuthenticationType))
-            {
-                writer.WritePropertyName("authenticationType"u8);
-                writer.WriteStringValue(AuthenticationType);
-            }
-            if (Optional.IsDefined(CloudToDeviceMessageCount))
-            {
-                writer.WritePropertyName("cloudToDeviceMessageCount"u8);
-                writer.WriteNumberValue(CloudToDeviceMessageCount.Value);
-            }
-            if (Optional.IsDefined(ConnectionState))
-            {
-                writer.WritePropertyName("connectionState"u8);
-                writer.WriteStringValue(ConnectionState);
-            }
-            if (Optional.IsDefined(DeviceId))
-            {
-                writer.WritePropertyName("deviceId"u8);
-                writer.WriteStringValue(DeviceId);
-            }
-            if (Optional.IsDefined(Etag))
-            {
-                writer.WritePropertyName("etag"u8);
-                writer.WriteStringValue(Etag);
-            }
-            if (Optional.IsDefined(LastActivityTime))
-            {
-                writer.WritePropertyName("lastActivityTime"u8);
-                writer.WriteStringValue(LastActivityTime);
-            }
-            writer.WritePropertyName("properties"u8);
-            writer.WriteObjectValue(Properties, options);
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            if (Optional.IsDefined(StatusUpdateTime))
-            {
-                writer.WritePropertyName("statusUpdateTime"u8);
-                writer.WriteStringValue(StatusUpdateTime);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteNumberValue(Version.Value);
-            }
-            writer.WritePropertyName("x509Thumbprint"u8);
-            writer.WriteObjectValue(X509Thumbprint, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceTwinInfo IJsonModel<DeviceTwinInfo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfo>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinInfo)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceTwinInfo(document.RootElement, options);
-        }
-
-        internal static DeviceTwinInfo DeserializeDeviceTwinInfo(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string authenticationType = default;
-            float? cloudToDeviceMessageCount = default;
-            string connectionState = default;
-            string deviceId = default;
-            string etag = default;
-            string lastActivityTime = default;
-            DeviceTwinInfoProperties properties = default;
-            string status = default;
-            string statusUpdateTime = default;
-            float? version = default;
-            DeviceTwinInfoX509Thumbprint x509Thumbprint = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("authenticationType"u8))
-                {
-                    authenticationType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("cloudToDeviceMessageCount"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    cloudToDeviceMessageCount = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("connectionState"u8))
-                {
-                    connectionState = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("deviceId"u8))
-                {
-                    deviceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("etag"u8))
-                {
-                    etag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("lastActivityTime"u8))
-                {
-                    lastActivityTime = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    properties = DeviceTwinInfoProperties.DeserializeDeviceTwinInfoProperties(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("statusUpdateTime"u8))
-                {
-                    statusUpdateTime = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("x509Thumbprint"u8))
-                {
-                    x509Thumbprint = DeviceTwinInfoX509Thumbprint.DeserializeDeviceTwinInfoX509Thumbprint(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceTwinInfo(
-                authenticationType,
-                cloudToDeviceMessageCount,
-                connectionState,
-                deviceId,
-                etag,
-                lastActivityTime,
-                properties,
-                status,
-                statusUpdateTime,
-                version,
-                x509Thumbprint,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceTwinInfo>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfo>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinInfo)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceTwinInfo IPersistableModel<DeviceTwinInfo>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfo>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceTwinInfo(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinInfo)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceTwinInfo>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceTwinInfo FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceTwinInfo(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfo.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfo.cs
deleted file mode 100644
index 8852435012fb..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfo.cs
+++ /dev/null
@@ -1,118 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Information about the device twin, which is the cloud representation of application device metadata. </summary>
-    public partial class DeviceTwinInfo
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinInfo"/>. </summary>
-        /// <param name="properties"> Properties JSON element. </param>
-        /// <param name="x509Thumbprint"> The thumbprint is a unique value for the x509 certificate, commonly used to find a particular certificate in a certificate store. The thumbprint is dynamically generated using the SHA1 algorithm, and does not physically exist in the certificate. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="properties"/> or <paramref name="x509Thumbprint"/> is null. </exception>
-        internal DeviceTwinInfo(DeviceTwinInfoProperties properties, DeviceTwinInfoX509Thumbprint x509Thumbprint)
-        {
-            Argument.AssertNotNull(properties, nameof(properties));
-            Argument.AssertNotNull(x509Thumbprint, nameof(x509Thumbprint));
-
-            Properties = properties;
-            X509Thumbprint = x509Thumbprint;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinInfo"/>. </summary>
-        /// <param name="authenticationType"> Authentication type used for this device: either SAS, SelfSigned, or CertificateAuthority. </param>
-        /// <param name="cloudToDeviceMessageCount"> Count of cloud to device messages sent to this device. </param>
-        /// <param name="connectionState"> Whether the device is connected or disconnected. </param>
-        /// <param name="deviceId"> The unique identifier of the device twin. </param>
-        /// <param name="etag"> A piece of information that describes the content of the device twin. Each etag is guaranteed to be unique per device twin. </param>
-        /// <param name="lastActivityTime"> The ISO8601 timestamp of the last activity. </param>
-        /// <param name="properties"> Properties JSON element. </param>
-        /// <param name="status"> Whether the device twin is enabled or disabled. </param>
-        /// <param name="statusUpdateTime"> The ISO8601 timestamp of the last device twin status update. </param>
-        /// <param name="version"> An integer that is incremented by one each time the device twin is updated. </param>
-        /// <param name="x509Thumbprint"> The thumbprint is a unique value for the x509 certificate, commonly used to find a particular certificate in a certificate store. The thumbprint is dynamically generated using the SHA1 algorithm, and does not physically exist in the certificate. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceTwinInfo(string authenticationType, float? cloudToDeviceMessageCount, string connectionState, string deviceId, string etag, string lastActivityTime, DeviceTwinInfoProperties properties, string status, string statusUpdateTime, float? version, DeviceTwinInfoX509Thumbprint x509Thumbprint, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AuthenticationType = authenticationType;
-            CloudToDeviceMessageCount = cloudToDeviceMessageCount;
-            ConnectionState = connectionState;
-            DeviceId = deviceId;
-            Etag = etag;
-            LastActivityTime = lastActivityTime;
-            Properties = properties;
-            Status = status;
-            StatusUpdateTime = statusUpdateTime;
-            Version = version;
-            X509Thumbprint = x509Thumbprint;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinInfo"/> for deserialization. </summary>
-        internal DeviceTwinInfo()
-        {
-        }
-
-        /// <summary> Authentication type used for this device: either SAS, SelfSigned, or CertificateAuthority. </summary>
-        public string AuthenticationType { get; }
-        /// <summary> Count of cloud to device messages sent to this device. </summary>
-        public float? CloudToDeviceMessageCount { get; }
-        /// <summary> Whether the device is connected or disconnected. </summary>
-        public string ConnectionState { get; }
-        /// <summary> The unique identifier of the device twin. </summary>
-        public string DeviceId { get; }
-        /// <summary> A piece of information that describes the content of the device twin. Each etag is guaranteed to be unique per device twin. </summary>
-        public string Etag { get; }
-        /// <summary> The ISO8601 timestamp of the last activity. </summary>
-        public string LastActivityTime { get; }
-        /// <summary> Properties JSON element. </summary>
-        public DeviceTwinInfoProperties Properties { get; }
-        /// <summary> Whether the device twin is enabled or disabled. </summary>
-        public string Status { get; }
-        /// <summary> The ISO8601 timestamp of the last device twin status update. </summary>
-        public string StatusUpdateTime { get; }
-        /// <summary> An integer that is incremented by one each time the device twin is updated. </summary>
-        public float? Version { get; }
-        /// <summary> The thumbprint is a unique value for the x509 certificate, commonly used to find a particular certificate in a certificate store. The thumbprint is dynamically generated using the SHA1 algorithm, and does not physically exist in the certificate. </summary>
-        public DeviceTwinInfoX509Thumbprint X509Thumbprint { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoProperties.Serialization.cs
deleted file mode 100644
index 6cea8bc485d0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoProperties.Serialization.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceTwinInfoProperties : IUtf8JsonSerializable, IJsonModel<DeviceTwinInfoProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceTwinInfoProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceTwinInfoProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinInfoProperties)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("desired"u8);
-            writer.WriteObjectValue(Desired, options);
-            writer.WritePropertyName("reported"u8);
-            writer.WriteObjectValue(Reported, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceTwinInfoProperties IJsonModel<DeviceTwinInfoProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinInfoProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceTwinInfoProperties(document.RootElement, options);
-        }
-
-        internal static DeviceTwinInfoProperties DeserializeDeviceTwinInfoProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DeviceTwinProperties desired = default;
-            DeviceTwinProperties reported = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("desired"u8))
-                {
-                    desired = DeviceTwinProperties.DeserializeDeviceTwinProperties(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("reported"u8))
-                {
-                    reported = DeviceTwinProperties.DeserializeDeviceTwinProperties(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceTwinInfoProperties(desired, reported, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceTwinInfoProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinInfoProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceTwinInfoProperties IPersistableModel<DeviceTwinInfoProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfoProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceTwinInfoProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinInfoProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceTwinInfoProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceTwinInfoProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceTwinInfoProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoProperties.cs
deleted file mode 100644
index 1d970974ba3d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoProperties.cs
+++ /dev/null
@@ -1,82 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Properties JSON element. </summary>
-    public partial class DeviceTwinInfoProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinInfoProperties"/>. </summary>
-        /// <param name="desired"> A portion of the properties that can be written only by the application back-end, and read by the device. </param>
-        /// <param name="reported"> A portion of the properties that can be written only by the device, and read by the application back-end. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="desired"/> or <paramref name="reported"/> is null. </exception>
-        internal DeviceTwinInfoProperties(DeviceTwinProperties desired, DeviceTwinProperties reported)
-        {
-            Argument.AssertNotNull(desired, nameof(desired));
-            Argument.AssertNotNull(reported, nameof(reported));
-
-            Desired = desired;
-            Reported = reported;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinInfoProperties"/>. </summary>
-        /// <param name="desired"> A portion of the properties that can be written only by the application back-end, and read by the device. </param>
-        /// <param name="reported"> A portion of the properties that can be written only by the device, and read by the application back-end. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceTwinInfoProperties(DeviceTwinProperties desired, DeviceTwinProperties reported, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Desired = desired;
-            Reported = reported;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinInfoProperties"/> for deserialization. </summary>
-        internal DeviceTwinInfoProperties()
-        {
-        }
-
-        /// <summary> A portion of the properties that can be written only by the application back-end, and read by the device. </summary>
-        public DeviceTwinProperties Desired { get; }
-        /// <summary> A portion of the properties that can be written only by the device, and read by the application back-end. </summary>
-        public DeviceTwinProperties Reported { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoX509Thumbprint.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoX509Thumbprint.Serialization.cs
deleted file mode 100644
index c239f0edb6a5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoX509Thumbprint.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceTwinInfoX509Thumbprint : IUtf8JsonSerializable, IJsonModel<DeviceTwinInfoX509Thumbprint>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceTwinInfoX509Thumbprint>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceTwinInfoX509Thumbprint>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfoX509Thumbprint>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinInfoX509Thumbprint)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(PrimaryThumbprint))
-            {
-                writer.WritePropertyName("primaryThumbprint"u8);
-                writer.WriteStringValue(PrimaryThumbprint);
-            }
-            if (Optional.IsDefined(SecondaryThumbprint))
-            {
-                writer.WritePropertyName("secondaryThumbprint"u8);
-                writer.WriteStringValue(SecondaryThumbprint);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceTwinInfoX509Thumbprint IJsonModel<DeviceTwinInfoX509Thumbprint>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfoX509Thumbprint>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinInfoX509Thumbprint)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceTwinInfoX509Thumbprint(document.RootElement, options);
-        }
-
-        internal static DeviceTwinInfoX509Thumbprint DeserializeDeviceTwinInfoX509Thumbprint(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string primaryThumbprint = default;
-            string secondaryThumbprint = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("primaryThumbprint"u8))
-                {
-                    primaryThumbprint = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("secondaryThumbprint"u8))
-                {
-                    secondaryThumbprint = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceTwinInfoX509Thumbprint(primaryThumbprint, secondaryThumbprint, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceTwinInfoX509Thumbprint>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfoX509Thumbprint>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinInfoX509Thumbprint)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceTwinInfoX509Thumbprint IPersistableModel<DeviceTwinInfoX509Thumbprint>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinInfoX509Thumbprint>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceTwinInfoX509Thumbprint(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinInfoX509Thumbprint)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceTwinInfoX509Thumbprint>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceTwinInfoX509Thumbprint FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceTwinInfoX509Thumbprint(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoX509Thumbprint.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoX509Thumbprint.cs
deleted file mode 100644
index f28b11657691..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinInfoX509Thumbprint.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The thumbprint is a unique value for the x509 certificate, commonly used to find a particular certificate in a certificate store. The thumbprint is dynamically generated using the SHA1 algorithm, and does not physically exist in the certificate. </summary>
-    public partial class DeviceTwinInfoX509Thumbprint
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinInfoX509Thumbprint"/>. </summary>
-        internal DeviceTwinInfoX509Thumbprint()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinInfoX509Thumbprint"/>. </summary>
-        /// <param name="primaryThumbprint"> Primary thumbprint for the x509 certificate. </param>
-        /// <param name="secondaryThumbprint"> Secondary thumbprint for the x509 certificate. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceTwinInfoX509Thumbprint(string primaryThumbprint, string secondaryThumbprint, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            PrimaryThumbprint = primaryThumbprint;
-            SecondaryThumbprint = secondaryThumbprint;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Primary thumbprint for the x509 certificate. </summary>
-        public string PrimaryThumbprint { get; }
-        /// <summary> Secondary thumbprint for the x509 certificate. </summary>
-        public string SecondaryThumbprint { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinMetadata.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinMetadata.Serialization.cs
deleted file mode 100644
index 52a1525e9cec..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinMetadata.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceTwinMetadata : IUtf8JsonSerializable, IJsonModel<DeviceTwinMetadata>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceTwinMetadata>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceTwinMetadata>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinMetadata>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinMetadata)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(LastUpdated))
-            {
-                writer.WritePropertyName("lastUpdated"u8);
-                writer.WriteStringValue(LastUpdated);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceTwinMetadata IJsonModel<DeviceTwinMetadata>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinMetadata>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinMetadata)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceTwinMetadata(document.RootElement, options);
-        }
-
-        internal static DeviceTwinMetadata DeserializeDeviceTwinMetadata(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string lastUpdated = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("lastUpdated"u8))
-                {
-                    lastUpdated = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceTwinMetadata(lastUpdated, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceTwinMetadata>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinMetadata>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinMetadata)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceTwinMetadata IPersistableModel<DeviceTwinMetadata>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinMetadata>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceTwinMetadata(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinMetadata)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceTwinMetadata>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceTwinMetadata FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceTwinMetadata(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinMetadata.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinMetadata.cs
deleted file mode 100644
index f9e2218438b6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinMetadata.cs
+++ /dev/null
@@ -1,65 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Metadata information for the properties JSON document. </summary>
-    public partial class DeviceTwinMetadata
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinMetadata"/>. </summary>
-        internal DeviceTwinMetadata()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinMetadata"/>. </summary>
-        /// <param name="lastUpdated"> The ISO8601 timestamp of the last time the properties were updated. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceTwinMetadata(string lastUpdated, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            LastUpdated = lastUpdated;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The ISO8601 timestamp of the last time the properties were updated. </summary>
-        public string LastUpdated { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinProperties.Serialization.cs
deleted file mode 100644
index 1ce535a74966..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinProperties.Serialization.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class DeviceTwinProperties : IUtf8JsonSerializable, IJsonModel<DeviceTwinProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceTwinProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<DeviceTwinProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinProperties)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("metadata"u8);
-            writer.WriteObjectValue(Metadata, options);
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("version"u8);
-                writer.WriteNumberValue(Version.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        DeviceTwinProperties IJsonModel<DeviceTwinProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DeviceTwinProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceTwinProperties(document.RootElement, options);
-        }
-
-        internal static DeviceTwinProperties DeserializeDeviceTwinProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DeviceTwinMetadata metadata = default;
-            float? version = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("metadata"u8))
-                {
-                    metadata = DeviceTwinMetadata.DeserializeDeviceTwinMetadata(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("version"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    version = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceTwinProperties(metadata, version, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DeviceTwinProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DeviceTwinProperties IPersistableModel<DeviceTwinProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceTwinProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDeviceTwinProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DeviceTwinProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DeviceTwinProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static DeviceTwinProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDeviceTwinProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinProperties.cs
deleted file mode 100644
index c78e2695137a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/DeviceTwinProperties.cs
+++ /dev/null
@@ -1,79 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> A portion of the properties that can be written only by the application back-end, and read by the device. </summary>
-    public partial class DeviceTwinProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinProperties"/>. </summary>
-        /// <param name="metadata"> Metadata information for the properties JSON document. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="metadata"/> is null. </exception>
-        internal DeviceTwinProperties(DeviceTwinMetadata metadata)
-        {
-            Argument.AssertNotNull(metadata, nameof(metadata));
-
-            Metadata = metadata;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinProperties"/>. </summary>
-        /// <param name="metadata"> Metadata information for the properties JSON document. </param>
-        /// <param name="version"> Version of device twin properties. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceTwinProperties(DeviceTwinMetadata metadata, float? version, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Metadata = metadata;
-            Version = version;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DeviceTwinProperties"/> for deserialization. </summary>
-        internal DeviceTwinProperties()
-        {
-        }
-
-        /// <summary> Metadata information for the properties JSON document. </summary>
-        public DeviceTwinMetadata Metadata { get; }
-        /// <summary> Version of device twin properties. </summary>
-        public float? Version { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientCreatedOrUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientCreatedOrUpdatedEventData.Serialization.cs
deleted file mode 100644
index 6ca3505ba0e6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientCreatedOrUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class EventGridMQTTClientCreatedOrUpdatedEventData : IUtf8JsonSerializable, IJsonModel<EventGridMQTTClientCreatedOrUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EventGridMQTTClientCreatedOrUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<EventGridMQTTClientCreatedOrUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientCreatedOrUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientCreatedOrUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("state"u8);
-            writer.WriteStringValue(State.ToString());
-            writer.WritePropertyName("createdOn"u8);
-            writer.WriteStringValue(CreatedOn, "O");
-            writer.WritePropertyName("updatedOn"u8);
-            writer.WriteStringValue(UpdatedOn, "O");
-            writer.WritePropertyName("attributes"u8);
-            writer.WriteStartObject();
-            foreach (var item in Attributes)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-        }
-
-        EventGridMQTTClientCreatedOrUpdatedEventData IJsonModel<EventGridMQTTClientCreatedOrUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientCreatedOrUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientCreatedOrUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeEventGridMQTTClientCreatedOrUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static EventGridMQTTClientCreatedOrUpdatedEventData DeserializeEventGridMQTTClientCreatedOrUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            EventGridMQTTClientState state = default;
-            DateTimeOffset createdOn = default;
-            DateTimeOffset updatedOn = default;
-            IReadOnlyDictionary<string, string> attributes = default;
-            string clientAuthenticationName = default;
-            string clientName = default;
-            string namespaceName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("state"u8))
-                {
-                    state = new EventGridMQTTClientState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("createdOn"u8))
-                {
-                    createdOn = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("updatedOn"u8))
-                {
-                    updatedOn = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("attributes"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    attributes = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("clientAuthenticationName"u8))
-                {
-                    clientAuthenticationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientName"u8))
-                {
-                    clientName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new EventGridMQTTClientCreatedOrUpdatedEventData(
-                clientAuthenticationName,
-                clientName,
-                namespaceName,
-                serializedAdditionalRawData,
-                state,
-                createdOn,
-                updatedOn,
-                attributes);
-        }
-
-        BinaryData IPersistableModel<EventGridMQTTClientCreatedOrUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientCreatedOrUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientCreatedOrUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        EventGridMQTTClientCreatedOrUpdatedEventData IPersistableModel<EventGridMQTTClientCreatedOrUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientCreatedOrUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeEventGridMQTTClientCreatedOrUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientCreatedOrUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<EventGridMQTTClientCreatedOrUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new EventGridMQTTClientCreatedOrUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeEventGridMQTTClientCreatedOrUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientCreatedOrUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientCreatedOrUpdatedEventData.cs
deleted file mode 100644
index dde0c575b475..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientCreatedOrUpdatedEventData.cs
+++ /dev/null
@@ -1,79 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.EventGrid.MQTTClientCreatedOrUpdated event. </summary>
-    public partial class EventGridMQTTClientCreatedOrUpdatedEventData : EventGridMQTTClientEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientCreatedOrUpdatedEventData"/>. </summary>
-        /// <param name="state"> Configured state of the client. The value could be Enabled or Disabled. </param>
-        /// <param name="createdOn"> Time the client resource is created based on the provider's UTC time. </param>
-        /// <param name="updatedOn">
-        /// Time the client resource is last updated based on the provider's UTC time. If
-        /// the client resource was never updated, this value is identical to the value of
-        /// the 'createdOn' property.
-        /// </param>
-        /// <param name="attributes"> The key-value attributes that are assigned to the client resource. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="attributes"/> is null. </exception>
-        internal EventGridMQTTClientCreatedOrUpdatedEventData(EventGridMQTTClientState state, DateTimeOffset createdOn, DateTimeOffset updatedOn, IReadOnlyDictionary<string, string> attributes)
-        {
-            Argument.AssertNotNull(attributes, nameof(attributes));
-
-            State = state;
-            CreatedOn = createdOn;
-            UpdatedOn = updatedOn;
-            Attributes = attributes;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientCreatedOrUpdatedEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="state"> Configured state of the client. The value could be Enabled or Disabled. </param>
-        /// <param name="createdOn"> Time the client resource is created based on the provider's UTC time. </param>
-        /// <param name="updatedOn">
-        /// Time the client resource is last updated based on the provider's UTC time. If
-        /// the client resource was never updated, this value is identical to the value of
-        /// the 'createdOn' property.
-        /// </param>
-        /// <param name="attributes"> The key-value attributes that are assigned to the client resource. </param>
-        internal EventGridMQTTClientCreatedOrUpdatedEventData(string clientAuthenticationName, string clientName, string namespaceName, IDictionary<string, BinaryData> serializedAdditionalRawData, EventGridMQTTClientState state, DateTimeOffset createdOn, DateTimeOffset updatedOn, IReadOnlyDictionary<string, string> attributes) : base(clientAuthenticationName, clientName, namespaceName, serializedAdditionalRawData)
-        {
-            State = state;
-            CreatedOn = createdOn;
-            UpdatedOn = updatedOn;
-            Attributes = attributes;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientCreatedOrUpdatedEventData"/> for deserialization. </summary>
-        internal EventGridMQTTClientCreatedOrUpdatedEventData()
-        {
-        }
-
-        /// <summary> Configured state of the client. The value could be Enabled or Disabled. </summary>
-        public EventGridMQTTClientState State { get; }
-        /// <summary> Time the client resource is created based on the provider's UTC time. </summary>
-        public DateTimeOffset CreatedOn { get; }
-        /// <summary>
-        /// Time the client resource is last updated based on the provider's UTC time. If
-        /// the client resource was never updated, this value is identical to the value of
-        /// the 'createdOn' property.
-        /// </summary>
-        public DateTimeOffset UpdatedOn { get; }
-        /// <summary> The key-value attributes that are assigned to the client resource. </summary>
-        public IReadOnlyDictionary<string, string> Attributes { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDeletedEventData.Serialization.cs
deleted file mode 100644
index 7e81e11c1acd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class EventGridMQTTClientDeletedEventData : IUtf8JsonSerializable, IJsonModel<EventGridMQTTClientDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EventGridMQTTClientDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<EventGridMQTTClientDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        EventGridMQTTClientDeletedEventData IJsonModel<EventGridMQTTClientDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeEventGridMQTTClientDeletedEventData(document.RootElement, options);
-        }
-
-        internal static EventGridMQTTClientDeletedEventData DeserializeEventGridMQTTClientDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string clientAuthenticationName = default;
-            string clientName = default;
-            string namespaceName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("clientAuthenticationName"u8))
-                {
-                    clientAuthenticationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientName"u8))
-                {
-                    clientName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new EventGridMQTTClientDeletedEventData(clientAuthenticationName, clientName, namespaceName, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<EventGridMQTTClientDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        EventGridMQTTClientDeletedEventData IPersistableModel<EventGridMQTTClientDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeEventGridMQTTClientDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<EventGridMQTTClientDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new EventGridMQTTClientDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeEventGridMQTTClientDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDeletedEventData.cs
deleted file mode 100644
index a5660854989a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDeletedEventData.cs
+++ /dev/null
@@ -1,34 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.EventGrid.MQTTClientDeleted event. </summary>
-    public partial class EventGridMQTTClientDeletedEventData : EventGridMQTTClientEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientDeletedEventData"/>. </summary>
-        internal EventGridMQTTClientDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientDeletedEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal EventGridMQTTClientDeletedEventData(string clientAuthenticationName, string clientName, string namespaceName, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(clientAuthenticationName, clientName, namespaceName, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDisconnectionReason.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDisconnectionReason.cs
deleted file mode 100644
index a8e88d5b0c30..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientDisconnectionReason.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> EventGrid MQTT Client Disconnection Reason. </summary>
-    public readonly partial struct EventGridMQTTClientDisconnectionReason : IEquatable<EventGridMQTTClientDisconnectionReason>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientDisconnectionReason"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public EventGridMQTTClientDisconnectionReason(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ClientAuthenticationErrorValue = "ClientAuthenticationError";
-        private const string ClientAuthorizationErrorValue = "ClientAuthorizationError";
-        private const string ClientErrorValue = "ClientError";
-        private const string ClientInitiatedDisconnectValue = "ClientInitiatedDisconnect";
-        private const string ConnectionLostValue = "ConnectionLost";
-        private const string IpForbiddenValue = "IpForbidden";
-        private const string QuotaExceededValue = "QuotaExceeded";
-        private const string ServerErrorValue = "ServerError";
-        private const string ServerInitiatedDisconnectValue = "ServerInitiatedDisconnect";
-        private const string SessionOverflowValue = "SessionOverflow";
-        private const string SessionTakenOverValue = "SessionTakenOver";
-
-        /// <summary> The client got disconnected for any authentication reasons (for example, certificate expired, client got disabled, or client configuration changed). </summary>
-        public static EventGridMQTTClientDisconnectionReason ClientAuthenticationError { get; } = new EventGridMQTTClientDisconnectionReason(ClientAuthenticationErrorValue);
-        /// <summary> The client got disconnected for any authorization reasons (for example, because of a change in the configuration of topic spaces, permission bindings, or client groups). </summary>
-        public static EventGridMQTTClientDisconnectionReason ClientAuthorizationError { get; } = new EventGridMQTTClientDisconnectionReason(ClientAuthorizationErrorValue);
-        /// <summary> The client sent a bad request or used one of the unsupported features that resulted in a connection termination by the service. </summary>
-        public static EventGridMQTTClientDisconnectionReason ClientError { get; } = new EventGridMQTTClientDisconnectionReason(ClientErrorValue);
-        /// <summary> The client initiated a graceful disconnect through a DISCONNECT packet for MQTT or a close frame for MQTT over WebSocket. </summary>
-        public static EventGridMQTTClientDisconnectionReason ClientInitiatedDisconnect { get; } = new EventGridMQTTClientDisconnectionReason(ClientInitiatedDisconnectValue);
-        /// <summary> The client-server connection is lost. (EXCHANGE ONLINE PROTECTION). </summary>
-        public static EventGridMQTTClientDisconnectionReason ConnectionLost { get; } = new EventGridMQTTClientDisconnectionReason(ConnectionLostValue);
-        /// <summary> The client's IP address is blocked by IP filter or Private links configuration. </summary>
-        public static EventGridMQTTClientDisconnectionReason IpForbidden { get; } = new EventGridMQTTClientDisconnectionReason(IpForbiddenValue);
-        /// <summary> The client exceeded one or more of the throttling limits that resulted in a connection termination by the service. </summary>
-        public static EventGridMQTTClientDisconnectionReason QuotaExceeded { get; } = new EventGridMQTTClientDisconnectionReason(QuotaExceededValue);
-        /// <summary> The connection got terminated due to an unexpected server error. </summary>
-        public static EventGridMQTTClientDisconnectionReason ServerError { get; } = new EventGridMQTTClientDisconnectionReason(ServerErrorValue);
-        /// <summary> The server initiates a graceful disconnect for any operational reason. </summary>
-        public static EventGridMQTTClientDisconnectionReason ServerInitiatedDisconnect { get; } = new EventGridMQTTClientDisconnectionReason(ServerInitiatedDisconnectValue);
-        /// <summary> The client's queue for unacknowledged QoS1 messages reached its limit, which resulted in a connection termination by the server. </summary>
-        public static EventGridMQTTClientDisconnectionReason SessionOverflow { get; } = new EventGridMQTTClientDisconnectionReason(SessionOverflowValue);
-        /// <summary> The client reconnected with the same authentication name, which resulted in the termination of the previous connection. </summary>
-        public static EventGridMQTTClientDisconnectionReason SessionTakenOver { get; } = new EventGridMQTTClientDisconnectionReason(SessionTakenOverValue);
-        /// <summary> Determines if two <see cref="EventGridMQTTClientDisconnectionReason"/> values are the same. </summary>
-        public static bool operator ==(EventGridMQTTClientDisconnectionReason left, EventGridMQTTClientDisconnectionReason right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="EventGridMQTTClientDisconnectionReason"/> values are not the same. </summary>
-        public static bool operator !=(EventGridMQTTClientDisconnectionReason left, EventGridMQTTClientDisconnectionReason right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="EventGridMQTTClientDisconnectionReason"/>. </summary>
-        public static implicit operator EventGridMQTTClientDisconnectionReason(string value) => new EventGridMQTTClientDisconnectionReason(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is EventGridMQTTClientDisconnectionReason other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(EventGridMQTTClientDisconnectionReason other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientEventData.Serialization.cs
deleted file mode 100644
index eac1ae874e9f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientEventData.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class EventGridMQTTClientEventData : IUtf8JsonSerializable, IJsonModel<EventGridMQTTClientEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EventGridMQTTClientEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<EventGridMQTTClientEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ClientAuthenticationName))
-            {
-                writer.WritePropertyName("clientAuthenticationName"u8);
-                writer.WriteStringValue(ClientAuthenticationName);
-            }
-            if (Optional.IsDefined(ClientName))
-            {
-                writer.WritePropertyName("clientName"u8);
-                writer.WriteStringValue(ClientName);
-            }
-            if (Optional.IsDefined(NamespaceName))
-            {
-                writer.WritePropertyName("namespaceName"u8);
-                writer.WriteStringValue(NamespaceName);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        EventGridMQTTClientEventData IJsonModel<EventGridMQTTClientEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeEventGridMQTTClientEventData(document.RootElement, options);
-        }
-
-        internal static EventGridMQTTClientEventData DeserializeEventGridMQTTClientEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string clientAuthenticationName = default;
-            string clientName = default;
-            string namespaceName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("clientAuthenticationName"u8))
-                {
-                    clientAuthenticationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientName"u8))
-                {
-                    clientName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new EventGridMQTTClientEventData(clientAuthenticationName, clientName, namespaceName, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<EventGridMQTTClientEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        EventGridMQTTClientEventData IPersistableModel<EventGridMQTTClientEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeEventGridMQTTClientEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<EventGridMQTTClientEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static EventGridMQTTClientEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeEventGridMQTTClientEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientEventData.cs
deleted file mode 100644
index 8c69eb51fec2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientEventData.cs
+++ /dev/null
@@ -1,81 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for MQTT Client state changes. </summary>
-    public partial class EventGridMQTTClientEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientEventData"/>. </summary>
-        internal EventGridMQTTClientEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal EventGridMQTTClientEventData(string clientAuthenticationName, string clientName, string namespaceName, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ClientAuthenticationName = clientAuthenticationName;
-            ClientName = clientName;
-            NamespaceName = namespaceName;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary>
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </summary>
-        public string ClientAuthenticationName { get; }
-        /// <summary> Name of the client resource in the Event Grid namespace. </summary>
-        public string ClientName { get; }
-        /// <summary> Name of the Event Grid namespace where the MQTT client was created or updated. </summary>
-        public string NamespaceName { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionConnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionConnectedEventData.Serialization.cs
deleted file mode 100644
index 79241a95385d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionConnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class EventGridMQTTClientSessionConnectedEventData : IUtf8JsonSerializable, IJsonModel<EventGridMQTTClientSessionConnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EventGridMQTTClientSessionConnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<EventGridMQTTClientSessionConnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientSessionConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientSessionConnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(ClientSessionName))
-            {
-                writer.WritePropertyName("clientSessionName"u8);
-                writer.WriteStringValue(ClientSessionName);
-            }
-            if (Optional.IsDefined(SequenceNumber))
-            {
-                writer.WritePropertyName("sequenceNumber"u8);
-                writer.WriteNumberValue(SequenceNumber.Value);
-            }
-        }
-
-        EventGridMQTTClientSessionConnectedEventData IJsonModel<EventGridMQTTClientSessionConnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientSessionConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientSessionConnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeEventGridMQTTClientSessionConnectedEventData(document.RootElement, options);
-        }
-
-        internal static EventGridMQTTClientSessionConnectedEventData DeserializeEventGridMQTTClientSessionConnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string clientSessionName = default;
-            long? sequenceNumber = default;
-            string clientAuthenticationName = default;
-            string clientName = default;
-            string namespaceName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("clientSessionName"u8))
-                {
-                    clientSessionName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequenceNumber"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    sequenceNumber = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("clientAuthenticationName"u8))
-                {
-                    clientAuthenticationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientName"u8))
-                {
-                    clientName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new EventGridMQTTClientSessionConnectedEventData(
-                clientAuthenticationName,
-                clientName,
-                namespaceName,
-                serializedAdditionalRawData,
-                clientSessionName,
-                sequenceNumber);
-        }
-
-        BinaryData IPersistableModel<EventGridMQTTClientSessionConnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientSessionConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientSessionConnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        EventGridMQTTClientSessionConnectedEventData IPersistableModel<EventGridMQTTClientSessionConnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientSessionConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeEventGridMQTTClientSessionConnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientSessionConnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<EventGridMQTTClientSessionConnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new EventGridMQTTClientSessionConnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeEventGridMQTTClientSessionConnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionConnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionConnectedEventData.cs
deleted file mode 100644
index 3a8dcde09042..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionConnectedEventData.cs
+++ /dev/null
@@ -1,57 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.EventGrid.MQTTClientSessionConnected event. </summary>
-    public partial class EventGridMQTTClientSessionConnectedEventData : EventGridMQTTClientEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientSessionConnectedEventData"/>. </summary>
-        internal EventGridMQTTClientSessionConnectedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientSessionConnectedEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="clientSessionName">
-        /// Unique identifier for the MQTT client's session. This case-sensitive string can
-        /// be up to 128 characters long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="sequenceNumber">
-        /// A number that helps indicate order of MQTT client session connected or
-        /// disconnected events. Latest event will have a sequence number that is higher
-        /// than the previous event.
-        /// </param>
-        internal EventGridMQTTClientSessionConnectedEventData(string clientAuthenticationName, string clientName, string namespaceName, IDictionary<string, BinaryData> serializedAdditionalRawData, string clientSessionName, long? sequenceNumber) : base(clientAuthenticationName, clientName, namespaceName, serializedAdditionalRawData)
-        {
-            ClientSessionName = clientSessionName;
-            SequenceNumber = sequenceNumber;
-        }
-
-        /// <summary>
-        /// Unique identifier for the MQTT client's session. This case-sensitive string can
-        /// be up to 128 characters long, and supports UTF-8 characters.
-        /// </summary>
-        public string ClientSessionName { get; }
-        /// <summary>
-        /// A number that helps indicate order of MQTT client session connected or
-        /// disconnected events. Latest event will have a sequence number that is higher
-        /// than the previous event.
-        /// </summary>
-        public long? SequenceNumber { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionDisconnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionDisconnectedEventData.Serialization.cs
deleted file mode 100644
index b0c2ea8c13df..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionDisconnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class EventGridMQTTClientSessionDisconnectedEventData : IUtf8JsonSerializable, IJsonModel<EventGridMQTTClientSessionDisconnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EventGridMQTTClientSessionDisconnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<EventGridMQTTClientSessionDisconnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientSessionDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientSessionDisconnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(ClientSessionName))
-            {
-                writer.WritePropertyName("clientSessionName"u8);
-                writer.WriteStringValue(ClientSessionName);
-            }
-            if (Optional.IsDefined(SequenceNumber))
-            {
-                writer.WritePropertyName("sequenceNumber"u8);
-                writer.WriteNumberValue(SequenceNumber.Value);
-            }
-            writer.WritePropertyName("disconnectionReason"u8);
-            writer.WriteStringValue(DisconnectionReason.ToString());
-        }
-
-        EventGridMQTTClientSessionDisconnectedEventData IJsonModel<EventGridMQTTClientSessionDisconnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientSessionDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventGridMQTTClientSessionDisconnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeEventGridMQTTClientSessionDisconnectedEventData(document.RootElement, options);
-        }
-
-        internal static EventGridMQTTClientSessionDisconnectedEventData DeserializeEventGridMQTTClientSessionDisconnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string clientSessionName = default;
-            long? sequenceNumber = default;
-            EventGridMQTTClientDisconnectionReason disconnectionReason = default;
-            string clientAuthenticationName = default;
-            string clientName = default;
-            string namespaceName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("clientSessionName"u8))
-                {
-                    clientSessionName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequenceNumber"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    sequenceNumber = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("disconnectionReason"u8))
-                {
-                    disconnectionReason = new EventGridMQTTClientDisconnectionReason(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("clientAuthenticationName"u8))
-                {
-                    clientAuthenticationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientName"u8))
-                {
-                    clientName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new EventGridMQTTClientSessionDisconnectedEventData(
-                clientAuthenticationName,
-                clientName,
-                namespaceName,
-                serializedAdditionalRawData,
-                clientSessionName,
-                sequenceNumber,
-                disconnectionReason);
-        }
-
-        BinaryData IPersistableModel<EventGridMQTTClientSessionDisconnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientSessionDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientSessionDisconnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        EventGridMQTTClientSessionDisconnectedEventData IPersistableModel<EventGridMQTTClientSessionDisconnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventGridMQTTClientSessionDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeEventGridMQTTClientSessionDisconnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(EventGridMQTTClientSessionDisconnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<EventGridMQTTClientSessionDisconnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new EventGridMQTTClientSessionDisconnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeEventGridMQTTClientSessionDisconnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionDisconnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionDisconnectedEventData.cs
deleted file mode 100644
index 2f9fcb7f6158..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientSessionDisconnectedEventData.cs
+++ /dev/null
@@ -1,77 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.EventGrid.MQTTClientSessionDisconnected event. </summary>
-    public partial class EventGridMQTTClientSessionDisconnectedEventData : EventGridMQTTClientEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientSessionDisconnectedEventData"/>. </summary>
-        /// <param name="disconnectionReason">
-        /// Reason for the disconnection of the MQTT client's session. The value could be
-        /// one of the values in the disconnection reasons table.
-        /// </param>
-        internal EventGridMQTTClientSessionDisconnectedEventData(EventGridMQTTClientDisconnectionReason disconnectionReason)
-        {
-            DisconnectionReason = disconnectionReason;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientSessionDisconnectedEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="clientSessionName">
-        /// Unique identifier for the MQTT client's session. This case-sensitive string can
-        /// be up to 128 characters long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="sequenceNumber">
-        /// A number that helps indicate order of MQTT client session connected or
-        /// disconnected events. Latest event will have a sequence number that is higher
-        /// than the previous event.
-        /// </param>
-        /// <param name="disconnectionReason">
-        /// Reason for the disconnection of the MQTT client's session. The value could be
-        /// one of the values in the disconnection reasons table.
-        /// </param>
-        internal EventGridMQTTClientSessionDisconnectedEventData(string clientAuthenticationName, string clientName, string namespaceName, IDictionary<string, BinaryData> serializedAdditionalRawData, string clientSessionName, long? sequenceNumber, EventGridMQTTClientDisconnectionReason disconnectionReason) : base(clientAuthenticationName, clientName, namespaceName, serializedAdditionalRawData)
-        {
-            ClientSessionName = clientSessionName;
-            SequenceNumber = sequenceNumber;
-            DisconnectionReason = disconnectionReason;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientSessionDisconnectedEventData"/> for deserialization. </summary>
-        internal EventGridMQTTClientSessionDisconnectedEventData()
-        {
-        }
-
-        /// <summary>
-        /// Unique identifier for the MQTT client's session. This case-sensitive string can
-        /// be up to 128 characters long, and supports UTF-8 characters.
-        /// </summary>
-        public string ClientSessionName { get; }
-        /// <summary>
-        /// A number that helps indicate order of MQTT client session connected or
-        /// disconnected events. Latest event will have a sequence number that is higher
-        /// than the previous event.
-        /// </summary>
-        public long? SequenceNumber { get; }
-        /// <summary>
-        /// Reason for the disconnection of the MQTT client's session. The value could be
-        /// one of the values in the disconnection reasons table.
-        /// </summary>
-        public EventGridMQTTClientDisconnectionReason DisconnectionReason { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientState.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientState.cs
deleted file mode 100644
index 7d2907bb7bd0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridMQTTClientState.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> EventGrid MQTT Client State. </summary>
-    public readonly partial struct EventGridMQTTClientState : IEquatable<EventGridMQTTClientState>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="EventGridMQTTClientState"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public EventGridMQTTClientState(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string EnabledValue = "Enabled";
-        private const string DisabledValue = "Disabled";
-
-        /// <summary> Enabled. </summary>
-        public static EventGridMQTTClientState Enabled { get; } = new EventGridMQTTClientState(EnabledValue);
-        /// <summary> Disabled. </summary>
-        public static EventGridMQTTClientState Disabled { get; } = new EventGridMQTTClientState(DisabledValue);
-        /// <summary> Determines if two <see cref="EventGridMQTTClientState"/> values are the same. </summary>
-        public static bool operator ==(EventGridMQTTClientState left, EventGridMQTTClientState right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="EventGridMQTTClientState"/> values are not the same. </summary>
-        public static bool operator !=(EventGridMQTTClientState left, EventGridMQTTClientState right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="EventGridMQTTClientState"/>. </summary>
-        public static implicit operator EventGridMQTTClientState(string value) => new EventGridMQTTClientState(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is EventGridMQTTClientState other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(EventGridMQTTClientState other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridSystemEventsModelFactory.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridSystemEventsModelFactory.cs
deleted file mode 100644
index e700c3d0b9a1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventGridSystemEventsModelFactory.cs
+++ /dev/null
@@ -1,5058 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Model factory for models. </summary>
-    public static partial class EventGridSystemEventsModelFactory
-    {
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiCenterApiDefinitionAddedEventData"/>. </summary>
-        /// <param name="title"> API definition title. </param>
-        /// <param name="description"> API definition description. </param>
-        /// <param name="specification"> API definition specification. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiCenterApiDefinitionAddedEventData"/> instance for mocking. </returns>
-        public static ApiCenterApiDefinitionAddedEventData ApiCenterApiDefinitionAddedEventData(string title = null, string description = null, ApiCenterApiSpecification specification = null)
-        {
-            return new ApiCenterApiDefinitionAddedEventData(title, description, specification, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiCenterApiSpecification"/>. </summary>
-        /// <param name="name"> Specification name. </param>
-        /// <param name="version"> Specification version. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiCenterApiSpecification"/> instance for mocking. </returns>
-        public static ApiCenterApiSpecification ApiCenterApiSpecification(string name = null, string version = null)
-        {
-            return new ApiCenterApiSpecification(name, version, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiCenterApiDefinitionUpdatedEventData"/>. </summary>
-        /// <param name="title"> API definition title. </param>
-        /// <param name="description"> API definition description. </param>
-        /// <param name="specification"> API definition specification. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiCenterApiDefinitionUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiCenterApiDefinitionUpdatedEventData ApiCenterApiDefinitionUpdatedEventData(string title = null, string description = null, ApiCenterApiSpecification specification = null)
-        {
-            return new ApiCenterApiDefinitionUpdatedEventData(title, description, specification, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementUserCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementUserCreatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementUserCreatedEventData ApiManagementUserCreatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementUserCreatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementUserUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementUserUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementUserUpdatedEventData ApiManagementUserUpdatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementUserUpdatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementUserDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementUserDeletedEventData"/> instance for mocking. </returns>
-        public static ApiManagementUserDeletedEventData ApiManagementUserDeletedEventData(string resourceUri = null)
-        {
-            return new ApiManagementUserDeletedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementSubscriptionCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementSubscriptionCreatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementSubscriptionCreatedEventData ApiManagementSubscriptionCreatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementSubscriptionCreatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementSubscriptionUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementSubscriptionUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementSubscriptionUpdatedEventData ApiManagementSubscriptionUpdatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementSubscriptionUpdatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementSubscriptionDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementSubscriptionDeletedEventData"/> instance for mocking. </returns>
-        public static ApiManagementSubscriptionDeletedEventData ApiManagementSubscriptionDeletedEventData(string resourceUri = null)
-        {
-            return new ApiManagementSubscriptionDeletedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementProductCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementProductCreatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementProductCreatedEventData ApiManagementProductCreatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementProductCreatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementProductUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementProductUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementProductUpdatedEventData ApiManagementProductUpdatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementProductUpdatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementProductDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementProductDeletedEventData"/> instance for mocking. </returns>
-        public static ApiManagementProductDeletedEventData ApiManagementProductDeletedEventData(string resourceUri = null)
-        {
-            return new ApiManagementProductDeletedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementApiCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementApiCreatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementApiCreatedEventData ApiManagementApiCreatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementApiCreatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementApiUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementApiUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementApiUpdatedEventData ApiManagementApiUpdatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementApiUpdatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementApiDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementApiDeletedEventData"/> instance for mocking. </returns>
-        public static ApiManagementApiDeletedEventData ApiManagementApiDeletedEventData(string resourceUri = null)
-        {
-            return new ApiManagementApiDeletedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementApiReleaseCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementApiReleaseCreatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementApiReleaseCreatedEventData ApiManagementApiReleaseCreatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementApiReleaseCreatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementApiReleaseUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementApiReleaseUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementApiReleaseUpdatedEventData ApiManagementApiReleaseUpdatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementApiReleaseUpdatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementApiReleaseDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/&lt;ResourceType&gt;/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementApiReleaseDeletedEventData"/> instance for mocking. </returns>
-        public static ApiManagementApiReleaseDeletedEventData ApiManagementApiReleaseDeletedEventData(string resourceUri = null)
-        {
-            return new ApiManagementApiReleaseDeletedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayCreatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayCreatedEventData ApiManagementGatewayCreatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayCreatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayUpdatedEventData ApiManagementGatewayUpdatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayUpdatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayDeletedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayDeletedEventData ApiManagementGatewayDeletedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayDeletedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayHostnameConfigurationCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayHostnameConfigurationCreatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayHostnameConfigurationCreatedEventData ApiManagementGatewayHostnameConfigurationCreatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayHostnameConfigurationCreatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayHostnameConfigurationUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayHostnameConfigurationUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayHostnameConfigurationUpdatedEventData ApiManagementGatewayHostnameConfigurationUpdatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayHostnameConfigurationUpdatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayHostnameConfigurationDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/hostnameConfigurations/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayHostnameConfigurationDeletedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayHostnameConfigurationDeletedEventData ApiManagementGatewayHostnameConfigurationDeletedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayHostnameConfigurationDeletedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayCertificateAuthorityCreatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayCertificateAuthorityCreatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayCertificateAuthorityCreatedEventData ApiManagementGatewayCertificateAuthorityCreatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayCertificateAuthorityCreatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayCertificateAuthorityUpdatedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayCertificateAuthorityUpdatedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayCertificateAuthorityUpdatedEventData ApiManagementGatewayCertificateAuthorityUpdatedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayCertificateAuthorityUpdatedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayCertificateAuthorityDeletedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/certificateAuthorities/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayCertificateAuthorityDeletedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayCertificateAuthorityDeletedEventData ApiManagementGatewayCertificateAuthorityDeletedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayCertificateAuthorityDeletedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayApiAddedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/apis/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayApiAddedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayApiAddedEventData ApiManagementGatewayApiAddedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayApiAddedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ApiManagementGatewayApiRemovedEventData"/>. </summary>
-        /// <param name="resourceUri"> The fully qualified ID of the resource that the compliance state change is for, including the resource name and resource type. Uses the format, `/subscriptions/&lt;SubscriptionID&gt;/resourceGroups/&lt;ResourceGroup&gt;/Microsoft.ApiManagement/service/&lt;ServiceName&gt;/gateways/&lt;GatewayName&gt;/apis/&lt;ResourceName&gt;`. </param>
-        /// <returns> A new <see cref="SystemEvents.ApiManagementGatewayApiRemovedEventData"/> instance for mocking. </returns>
-        public static ApiManagementGatewayApiRemovedEventData ApiManagementGatewayApiRemovedEventData(string resourceUri = null)
-        {
-            return new ApiManagementGatewayApiRemovedEventData(resourceUri, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AppConfigurationKeyValueModifiedEventData"/>. </summary>
-        /// <param name="key"> The key used to identify the key-value that was modified. </param>
-        /// <param name="label"> The label, if any, used to identify the key-value that was modified. </param>
-        /// <param name="etag"> The etag representing the new state of the key-value. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <returns> A new <see cref="SystemEvents.AppConfigurationKeyValueModifiedEventData"/> instance for mocking. </returns>
-        public static AppConfigurationKeyValueModifiedEventData AppConfigurationKeyValueModifiedEventData(string key = null, string label = null, string etag = null, string syncToken = null)
-        {
-            return new AppConfigurationKeyValueModifiedEventData(key, label, etag, syncToken, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AppConfigurationKeyValueDeletedEventData"/>. </summary>
-        /// <param name="key"> The key used to identify the key-value that was deleted. </param>
-        /// <param name="label"> The label, if any, used to identify the key-value that was deleted. </param>
-        /// <param name="etag"> The etag representing the key-value that was deleted. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <returns> A new <see cref="SystemEvents.AppConfigurationKeyValueDeletedEventData"/> instance for mocking. </returns>
-        public static AppConfigurationKeyValueDeletedEventData AppConfigurationKeyValueDeletedEventData(string key = null, string label = null, string etag = null, string syncToken = null)
-        {
-            return new AppConfigurationKeyValueDeletedEventData(key, label, etag, syncToken, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AppConfigurationSnapshotEventData"/>. </summary>
-        /// <param name="name"> The name of the snapshot. </param>
-        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <returns> A new <see cref="SystemEvents.AppConfigurationSnapshotEventData"/> instance for mocking. </returns>
-        public static AppConfigurationSnapshotEventData AppConfigurationSnapshotEventData(string name = null, string etag = null, string syncToken = null)
-        {
-            return new AppConfigurationSnapshotEventData(name, etag, syncToken, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AppConfigurationSnapshotCreatedEventData"/>. </summary>
-        /// <param name="name"> The name of the snapshot. </param>
-        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <returns> A new <see cref="SystemEvents.AppConfigurationSnapshotCreatedEventData"/> instance for mocking. </returns>
-        public static AppConfigurationSnapshotCreatedEventData AppConfigurationSnapshotCreatedEventData(string name = null, string etag = null, string syncToken = null)
-        {
-            return new AppConfigurationSnapshotCreatedEventData(name, etag, syncToken, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AppConfigurationSnapshotModifiedEventData"/>. </summary>
-        /// <param name="name"> The name of the snapshot. </param>
-        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
-        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
-        /// <returns> A new <see cref="SystemEvents.AppConfigurationSnapshotModifiedEventData"/> instance for mocking. </returns>
-        public static AppConfigurationSnapshotModifiedEventData AppConfigurationSnapshotModifiedEventData(string name = null, string etag = null, string syncToken = null)
-        {
-            return new AppConfigurationSnapshotModifiedEventData(name, etag, syncToken, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsPrivateCloudEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsPrivateCloudEventData"/> instance for mocking. </returns>
-        public static AvsPrivateCloudEventData AvsPrivateCloudEventData(string operationId = null)
-        {
-            return new AvsPrivateCloudEventData(operationId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsPrivateCloudUpdatingEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsPrivateCloudUpdatingEventData"/> instance for mocking. </returns>
-        public static AvsPrivateCloudUpdatingEventData AvsPrivateCloudUpdatingEventData(string operationId = null)
-        {
-            return new AvsPrivateCloudUpdatingEventData(operationId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsPrivateCloudUpdatedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsPrivateCloudUpdatedEventData"/> instance for mocking. </returns>
-        public static AvsPrivateCloudUpdatedEventData AvsPrivateCloudUpdatedEventData(string operationId = null)
-        {
-            return new AvsPrivateCloudUpdatedEventData(operationId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsPrivateCloudFailedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="failureMessage"> Failure reason of an event. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsPrivateCloudFailedEventData"/> instance for mocking. </returns>
-        public static AvsPrivateCloudFailedEventData AvsPrivateCloudFailedEventData(string operationId = null, string failureMessage = null)
-        {
-            return new AvsPrivateCloudFailedEventData(operationId, serializedAdditionalRawData: null, failureMessage);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsClusterEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsClusterEventData"/> instance for mocking. </returns>
-        public static AvsClusterEventData AvsClusterEventData(string operationId = null, IEnumerable<string> addedHostNames = null, IEnumerable<string> removedHostNames = null, IEnumerable<string> inMaintenanceHostNames = null)
-        {
-            addedHostNames ??= new List<string>();
-            removedHostNames ??= new List<string>();
-            inMaintenanceHostNames ??= new List<string>();
-
-            return new AvsClusterEventData(operationId, addedHostNames?.ToList(), removedHostNames?.ToList(), inMaintenanceHostNames?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsClusterCreatedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsClusterCreatedEventData"/> instance for mocking. </returns>
-        public static AvsClusterCreatedEventData AvsClusterCreatedEventData(string operationId = null, IEnumerable<string> addedHostNames = null, IEnumerable<string> removedHostNames = null, IEnumerable<string> inMaintenanceHostNames = null)
-        {
-            addedHostNames ??= new List<string>();
-            removedHostNames ??= new List<string>();
-            inMaintenanceHostNames ??= new List<string>();
-
-            return new AvsClusterCreatedEventData(operationId, addedHostNames?.ToList(), removedHostNames?.ToList(), inMaintenanceHostNames?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsClusterDeletedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsClusterDeletedEventData"/> instance for mocking. </returns>
-        public static AvsClusterDeletedEventData AvsClusterDeletedEventData(string operationId = null, IEnumerable<string> addedHostNames = null, IEnumerable<string> removedHostNames = null, IEnumerable<string> inMaintenanceHostNames = null)
-        {
-            addedHostNames ??= new List<string>();
-            removedHostNames ??= new List<string>();
-            inMaintenanceHostNames ??= new List<string>();
-
-            return new AvsClusterDeletedEventData(operationId, addedHostNames?.ToList(), removedHostNames?.ToList(), inMaintenanceHostNames?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsClusterUpdatingEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsClusterUpdatingEventData"/> instance for mocking. </returns>
-        public static AvsClusterUpdatingEventData AvsClusterUpdatingEventData(string operationId = null, IEnumerable<string> addedHostNames = null, IEnumerable<string> removedHostNames = null, IEnumerable<string> inMaintenanceHostNames = null)
-        {
-            addedHostNames ??= new List<string>();
-            removedHostNames ??= new List<string>();
-            inMaintenanceHostNames ??= new List<string>();
-
-            return new AvsClusterUpdatingEventData(operationId, addedHostNames?.ToList(), removedHostNames?.ToList(), inMaintenanceHostNames?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsClusterUpdatedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsClusterUpdatedEventData"/> instance for mocking. </returns>
-        public static AvsClusterUpdatedEventData AvsClusterUpdatedEventData(string operationId = null, IEnumerable<string> addedHostNames = null, IEnumerable<string> removedHostNames = null, IEnumerable<string> inMaintenanceHostNames = null)
-        {
-            addedHostNames ??= new List<string>();
-            removedHostNames ??= new List<string>();
-            inMaintenanceHostNames ??= new List<string>();
-
-            return new AvsClusterUpdatedEventData(operationId, addedHostNames?.ToList(), removedHostNames?.ToList(), inMaintenanceHostNames?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsClusterFailedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="addedHostNames"> Hosts added to the cluster in this event, if any. </param>
-        /// <param name="removedHostNames"> Hosts removed from the cluster in this event, if any. </param>
-        /// <param name="inMaintenanceHostNames"> Hosts in Maintenance mode in the cluster, if any. </param>
-        /// <param name="failureMessage"> Failure reason of an event. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsClusterFailedEventData"/> instance for mocking. </returns>
-        public static AvsClusterFailedEventData AvsClusterFailedEventData(string operationId = null, IEnumerable<string> addedHostNames = null, IEnumerable<string> removedHostNames = null, IEnumerable<string> inMaintenanceHostNames = null, string failureMessage = null)
-        {
-            addedHostNames ??= new List<string>();
-            removedHostNames ??= new List<string>();
-            inMaintenanceHostNames ??= new List<string>();
-
-            return new AvsClusterFailedEventData(
-                operationId,
-                addedHostNames?.ToList(),
-                removedHostNames?.ToList(),
-                inMaintenanceHostNames?.ToList(),
-                serializedAdditionalRawData: null,
-                failureMessage);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsScriptExecutionEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsScriptExecutionEventData"/> instance for mocking. </returns>
-        public static AvsScriptExecutionEventData AvsScriptExecutionEventData(string operationId = null, string cmdletId = null, IEnumerable<string> output = null)
-        {
-            output ??= new List<string>();
-
-            return new AvsScriptExecutionEventData(operationId, cmdletId, output?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsScriptExecutionStartedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsScriptExecutionStartedEventData"/> instance for mocking. </returns>
-        public static AvsScriptExecutionStartedEventData AvsScriptExecutionStartedEventData(string operationId = null, string cmdletId = null, IEnumerable<string> output = null)
-        {
-            output ??= new List<string>();
-
-            return new AvsScriptExecutionStartedEventData(operationId, cmdletId, output?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsScriptExecutionFinishedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <param name="namedOutputs"> Named outputs of completed execution, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsScriptExecutionFinishedEventData"/> instance for mocking. </returns>
-        public static AvsScriptExecutionFinishedEventData AvsScriptExecutionFinishedEventData(string operationId = null, string cmdletId = null, IEnumerable<string> output = null, IReadOnlyDictionary<string, string> namedOutputs = null)
-        {
-            output ??= new List<string>();
-            namedOutputs ??= new Dictionary<string, string>();
-
-            return new AvsScriptExecutionFinishedEventData(operationId, cmdletId, output?.ToList(), serializedAdditionalRawData: null, namedOutputs);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsScriptExecutionCancelledEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsScriptExecutionCancelledEventData"/> instance for mocking. </returns>
-        public static AvsScriptExecutionCancelledEventData AvsScriptExecutionCancelledEventData(string operationId = null, string cmdletId = null, IEnumerable<string> output = null)
-        {
-            output ??= new List<string>();
-
-            return new AvsScriptExecutionCancelledEventData(operationId, cmdletId, output?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AvsScriptExecutionFailedEventData"/>. </summary>
-        /// <param name="operationId"> Id of the operation that caused this event. </param>
-        /// <param name="cmdletId"> Cmdlet referenced in the execution that caused this event. </param>
-        /// <param name="output"> Stdout outputs from the execution, if any. </param>
-        /// <param name="failureMessage"> Failure reason of an event. </param>
-        /// <returns> A new <see cref="SystemEvents.AvsScriptExecutionFailedEventData"/> instance for mocking. </returns>
-        public static AvsScriptExecutionFailedEventData AvsScriptExecutionFailedEventData(string operationId = null, string cmdletId = null, IEnumerable<string> output = null, string failureMessage = null)
-        {
-            output ??= new List<string>();
-
-            return new AvsScriptExecutionFailedEventData(operationId, cmdletId, output?.ToList(), serializedAdditionalRawData: null, failureMessage);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsIncomingCallEventData"/>. </summary>
-        /// <param name="toCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="fromCommunicationIdentifier"> The communication identifier of the user who initiated the call. </param>
-        /// <param name="serverCallId"> The Id of the server call. </param>
-        /// <param name="callerDisplayName"> Display name of caller. </param>
-        /// <param name="customContext"> Custom Context of Incoming Call. </param>
-        /// <param name="incomingCallContext"> Signed incoming call context. </param>
-        /// <param name="correlationId"> CorrelationId (CallId). </param>
-        /// <returns> A new <see cref="SystemEvents.AcsIncomingCallEventData"/> instance for mocking. </returns>
-        public static AcsIncomingCallEventData AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationIdentifier = null, CommunicationIdentifierModel fromCommunicationIdentifier = null, string serverCallId = null, string callerDisplayName = null, AcsIncomingCallCustomContext customContext = null, string incomingCallContext = null, string correlationId = null)
-        {
-            return new AcsIncomingCallEventData(
-                toCommunicationIdentifier,
-                fromCommunicationIdentifier,
-                serverCallId,
-                callerDisplayName,
-                customContext,
-                incomingCallContext,
-                correlationId,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.CommunicationIdentifierModel"/>. </summary>
-        /// <param name="kind"> The identifier kind. Only required in responses. </param>
-        /// <param name="rawId"> Raw Id of the identifier. Optional in requests, required in responses. </param>
-        /// <param name="communicationUser"> The communication user. </param>
-        /// <param name="phoneNumber"> The phone number. </param>
-        /// <param name="microsoftTeamsUser"> The Microsoft Teams user. </param>
-        /// <param name="microsoftTeamsApp"> The Microsoft Teams application. </param>
-        /// <returns> A new <see cref="SystemEvents.CommunicationIdentifierModel"/> instance for mocking. </returns>
-        public static CommunicationIdentifierModel CommunicationIdentifierModel(CommunicationIdentifierModelKind kind = default, string rawId = null, CommunicationUserIdentifierModel communicationUser = null, PhoneNumberIdentifierModel phoneNumber = null, MicrosoftTeamsUserIdentifierModel microsoftTeamsUser = null, MicrosoftTeamsAppIdentifierModel microsoftTeamsApp = null)
-        {
-            return new CommunicationIdentifierModel(
-                kind,
-                rawId,
-                communicationUser,
-                phoneNumber,
-                microsoftTeamsUser,
-                microsoftTeamsApp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.CommunicationUserIdentifierModel"/>. </summary>
-        /// <param name="id"> The Id of the communication user. </param>
-        /// <returns> A new <see cref="SystemEvents.CommunicationUserIdentifierModel"/> instance for mocking. </returns>
-        public static CommunicationUserIdentifierModel CommunicationUserIdentifierModel(string id = null)
-        {
-            return new CommunicationUserIdentifierModel(id, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.PhoneNumberIdentifierModel"/>. </summary>
-        /// <param name="value"> The phone number in E.164 format. </param>
-        /// <returns> A new <see cref="SystemEvents.PhoneNumberIdentifierModel"/> instance for mocking. </returns>
-        public static PhoneNumberIdentifierModel PhoneNumberIdentifierModel(string value = null)
-        {
-            return new PhoneNumberIdentifierModel(value, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MicrosoftTeamsUserIdentifierModel"/>. </summary>
-        /// <param name="userId"> The Id of the Microsoft Teams user. If not anonymous, this is the AAD object Id of the user. </param>
-        /// <param name="isAnonymous"> True if the Microsoft Teams user is anonymous. By default false if missing. </param>
-        /// <param name="cloud"> The cloud that the Microsoft Teams user belongs to. By default 'public' if missing. </param>
-        /// <returns> A new <see cref="SystemEvents.MicrosoftTeamsUserIdentifierModel"/> instance for mocking. </returns>
-        public static MicrosoftTeamsUserIdentifierModel MicrosoftTeamsUserIdentifierModel(string userId = null, bool? isAnonymous = null, CommunicationCloudEnvironmentModel cloud = default)
-        {
-            return new MicrosoftTeamsUserIdentifierModel(userId, isAnonymous, cloud, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MicrosoftTeamsAppIdentifierModel"/>. </summary>
-        /// <param name="appId"> The Id of the Microsoft Teams application. </param>
-        /// <param name="cloud"> The cloud that the Microsoft Teams application belongs to. By default 'public' if missing. </param>
-        /// <returns> A new <see cref="SystemEvents.MicrosoftTeamsAppIdentifierModel"/> instance for mocking. </returns>
-        public static MicrosoftTeamsAppIdentifierModel MicrosoftTeamsAppIdentifierModel(string appId = null, CommunicationCloudEnvironmentModel cloud = default)
-        {
-            return new MicrosoftTeamsAppIdentifierModel(appId, cloud, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsIncomingCallCustomContext"/>. </summary>
-        /// <param name="sipHeaders"> Sip Headers for incoming call. </param>
-        /// <param name="voipHeaders"> Voip Headers for incoming call. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsIncomingCallCustomContext"/> instance for mocking. </returns>
-        public static AcsIncomingCallCustomContext AcsIncomingCallCustomContext(IReadOnlyDictionary<string, string> sipHeaders = null, IReadOnlyDictionary<string, string> voipHeaders = null)
-        {
-            sipHeaders ??= new Dictionary<string, string>();
-            voipHeaders ??= new Dictionary<string, string>();
-
-            return new AcsIncomingCallCustomContext(sipHeaders, voipHeaders, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsUserDisconnectedEventData"/>. </summary>
-        /// <param name="userCommunicationIdentifier"> The communication identifier of the user who was disconnected. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsUserDisconnectedEventData"/> instance for mocking. </returns>
-        public static AcsUserDisconnectedEventData AcsUserDisconnectedEventData(CommunicationIdentifierModel userCommunicationIdentifier = null)
-        {
-            return new AcsUserDisconnectedEventData(userCommunicationIdentifier, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatEventBaseProperties"/> instance for mocking. </returns>
-        public static AcsChatEventBaseProperties AcsChatEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null)
-        {
-            return new AcsChatEventBaseProperties(recipientCommunicationIdentifier, transactionId, threadId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatEventInThreadBaseProperties"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatEventInThreadBaseProperties"/> instance for mocking. </returns>
-        public static AcsChatEventInThreadBaseProperties AcsChatEventInThreadBaseProperties(string transactionId = null, string threadId = null)
-        {
-            return new AcsChatEventInThreadBaseProperties(transactionId, threadId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatMessageEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatMessageEventBaseProperties"/> instance for mocking. </returns>
-        public static AcsChatMessageEventBaseProperties AcsChatMessageEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, string messageId = null, CommunicationIdentifierModel senderCommunicationIdentifier = null, string senderDisplayName = null, DateTimeOffset composeTime = default, string type = null, long? version = null)
-        {
-            return new AcsChatMessageEventBaseProperties(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatMessageReceivedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="messageBody"> The body of the chat message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatMessageReceivedEventData"/> instance for mocking. </returns>
-        public static AcsChatMessageReceivedEventData AcsChatMessageReceivedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, string messageId = null, CommunicationIdentifierModel senderCommunicationIdentifier = null, string senderDisplayName = null, DateTimeOffset composeTime = default, string type = null, long? version = null, string messageBody = null, IReadOnlyDictionary<string, string> metadata = null)
-        {
-            metadata ??= new Dictionary<string, string>();
-
-            return new AcsChatMessageReceivedEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                messageBody,
-                metadata);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatMessageEventInThreadBaseProperties"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatMessageEventInThreadBaseProperties"/> instance for mocking. </returns>
-        public static AcsChatMessageEventInThreadBaseProperties AcsChatMessageEventInThreadBaseProperties(string transactionId = null, string threadId = null, string messageId = null, CommunicationIdentifierModel senderCommunicationIdentifier = null, string senderDisplayName = null, DateTimeOffset composeTime = default, string type = null, long? version = null)
-        {
-            return new AcsChatMessageEventInThreadBaseProperties(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatMessageReceivedInThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="messageBody"> The body of the chat message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatMessageReceivedInThreadEventData"/> instance for mocking. </returns>
-        public static AcsChatMessageReceivedInThreadEventData AcsChatMessageReceivedInThreadEventData(string transactionId = null, string threadId = null, string messageId = null, CommunicationIdentifierModel senderCommunicationIdentifier = null, string senderDisplayName = null, DateTimeOffset composeTime = default, string type = null, long? version = null, string messageBody = null, IReadOnlyDictionary<string, string> metadata = null)
-        {
-            metadata ??= new Dictionary<string, string>();
-
-            return new AcsChatMessageReceivedInThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                messageBody,
-                metadata);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatMessageEditedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="messageBody"> The body of the chat message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <param name="editTime"> The time at which the message was edited. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatMessageEditedEventData"/> instance for mocking. </returns>
-        public static AcsChatMessageEditedEventData AcsChatMessageEditedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, string messageId = null, CommunicationIdentifierModel senderCommunicationIdentifier = null, string senderDisplayName = null, DateTimeOffset composeTime = default, string type = null, long? version = null, string messageBody = null, IReadOnlyDictionary<string, string> metadata = null, DateTimeOffset editTime = default)
-        {
-            metadata ??= new Dictionary<string, string>();
-
-            return new AcsChatMessageEditedEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                messageBody,
-                metadata,
-                editTime);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatMessageEditedInThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="messageBody"> The body of the chat message. </param>
-        /// <param name="metadata"> The chat message metadata. </param>
-        /// <param name="editTime"> The time at which the message was edited. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatMessageEditedInThreadEventData"/> instance for mocking. </returns>
-        public static AcsChatMessageEditedInThreadEventData AcsChatMessageEditedInThreadEventData(string transactionId = null, string threadId = null, string messageId = null, CommunicationIdentifierModel senderCommunicationIdentifier = null, string senderDisplayName = null, DateTimeOffset composeTime = default, string type = null, long? version = null, string messageBody = null, IReadOnlyDictionary<string, string> metadata = null, DateTimeOffset editTime = default)
-        {
-            metadata ??= new Dictionary<string, string>();
-
-            return new AcsChatMessageEditedInThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                messageBody,
-                metadata,
-                editTime);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatMessageDeletedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="deleteTime"> The time at which the message was deleted. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatMessageDeletedEventData"/> instance for mocking. </returns>
-        public static AcsChatMessageDeletedEventData AcsChatMessageDeletedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, string messageId = null, CommunicationIdentifierModel senderCommunicationIdentifier = null, string senderDisplayName = null, DateTimeOffset composeTime = default, string type = null, long? version = null, DateTimeOffset deleteTime = default)
-        {
-            return new AcsChatMessageDeletedEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                deleteTime);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatMessageDeletedInThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="messageId"> The chat message id. </param>
-        /// <param name="senderCommunicationIdentifier"> The communication identifier of the sender. </param>
-        /// <param name="senderDisplayName"> The display name of the sender. </param>
-        /// <param name="composeTime"> The original compose time of the message. </param>
-        /// <param name="type"> The type of the message. </param>
-        /// <param name="version"> The version of the message. </param>
-        /// <param name="deleteTime"> The time at which the message was deleted. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatMessageDeletedInThreadEventData"/> instance for mocking. </returns>
-        public static AcsChatMessageDeletedInThreadEventData AcsChatMessageDeletedInThreadEventData(string transactionId = null, string threadId = null, string messageId = null, CommunicationIdentifierModel senderCommunicationIdentifier = null, string senderDisplayName = null, DateTimeOffset composeTime = default, string type = null, long? version = null, DateTimeOffset deleteTime = default)
-        {
-            return new AcsChatMessageDeletedInThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                messageId,
-                senderCommunicationIdentifier,
-                senderDisplayName,
-                composeTime,
-                type,
-                version,
-                deleteTime);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadEventBaseProperties"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadEventBaseProperties"/> instance for mocking. </returns>
-        public static AcsChatThreadEventBaseProperties AcsChatThreadEventBaseProperties(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null)
-        {
-            return new AcsChatThreadEventBaseProperties(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadCreatedWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="createdByCommunicationIdentifier"> The communication identifier of the user who created the thread. </param>
-        /// <param name="properties"> The thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="participants"> The list of properties of participants who are part of the thread. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadCreatedWithUserEventData"/> instance for mocking. </returns>
-        public static AcsChatThreadCreatedWithUserEventData AcsChatThreadCreatedWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null, CommunicationIdentifierModel createdByCommunicationIdentifier = null, IReadOnlyDictionary<string, BinaryData> properties = null, IReadOnlyDictionary<string, string> metadata = null, IEnumerable<AcsChatThreadParticipantProperties> participants = null)
-        {
-            properties ??= new Dictionary<string, BinaryData>();
-            metadata ??= new Dictionary<string, string>();
-            participants ??= new List<AcsChatThreadParticipantProperties>();
-
-            return new AcsChatThreadCreatedWithUserEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version,
-                createdByCommunicationIdentifier,
-                properties,
-                metadata,
-                participants?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadParticipantProperties"/>. </summary>
-        /// <param name="displayName"> The name of the user. </param>
-        /// <param name="participantCommunicationIdentifier"> The communication identifier of the user. </param>
-        /// <param name="metadata"> The metadata of the user. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadParticipantProperties"/> instance for mocking. </returns>
-        public static AcsChatThreadParticipantProperties AcsChatThreadParticipantProperties(string displayName = null, CommunicationIdentifierModel participantCommunicationIdentifier = null, IReadOnlyDictionary<string, string> metadata = null)
-        {
-            metadata ??= new Dictionary<string, string>();
-
-            return new AcsChatThreadParticipantProperties(displayName, participantCommunicationIdentifier, metadata, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadEventInThreadBaseProperties"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadEventInThreadBaseProperties"/> instance for mocking. </returns>
-        public static AcsChatThreadEventInThreadBaseProperties AcsChatThreadEventInThreadBaseProperties(string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null)
-        {
-            return new AcsChatThreadEventInThreadBaseProperties(transactionId, threadId, serializedAdditionalRawData: null, createTime, version);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadCreatedEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="createdByCommunicationIdentifier"> The communication identifier of the user who created the thread. </param>
-        /// <param name="properties"> The thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="participants"> The list of properties of participants who are part of the thread. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadCreatedEventData"/> instance for mocking. </returns>
-        public static AcsChatThreadCreatedEventData AcsChatThreadCreatedEventData(string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null, CommunicationIdentifierModel createdByCommunicationIdentifier = null, IReadOnlyDictionary<string, BinaryData> properties = null, IReadOnlyDictionary<string, string> metadata = null, IEnumerable<AcsChatThreadParticipantProperties> participants = null)
-        {
-            properties ??= new Dictionary<string, BinaryData>();
-            metadata ??= new Dictionary<string, string>();
-            participants ??= new List<AcsChatThreadParticipantProperties>();
-
-            return new AcsChatThreadCreatedEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version,
-                createdByCommunicationIdentifier,
-                properties,
-                metadata,
-                participants?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadWithUserDeletedEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="deletedByCommunicationIdentifier"> The communication identifier of the user who deleted the thread. </param>
-        /// <param name="deleteTime"> The deletion time of the thread. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadWithUserDeletedEventData"/> instance for mocking. </returns>
-        public static AcsChatThreadWithUserDeletedEventData AcsChatThreadWithUserDeletedEventData(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null, CommunicationIdentifierModel deletedByCommunicationIdentifier = null, DateTimeOffset deleteTime = default)
-        {
-            return new AcsChatThreadWithUserDeletedEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version,
-                deletedByCommunicationIdentifier,
-                deleteTime);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadDeletedEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="deletedByCommunicationIdentifier"> The communication identifier of the user who deleted the thread. </param>
-        /// <param name="deleteTime"> The deletion time of the thread. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadDeletedEventData"/> instance for mocking. </returns>
-        public static AcsChatThreadDeletedEventData AcsChatThreadDeletedEventData(string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null, CommunicationIdentifierModel deletedByCommunicationIdentifier = null, DateTimeOffset deleteTime = default)
-        {
-            return new AcsChatThreadDeletedEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version,
-                deletedByCommunicationIdentifier,
-                deleteTime);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadPropertiesUpdatedPerUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="editedByCommunicationIdentifier"> The communication identifier of the user who updated the thread properties. </param>
-        /// <param name="editTime"> The time at which the properties of the thread were updated. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <param name="properties"> The updated thread properties. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadPropertiesUpdatedPerUserEventData"/> instance for mocking. </returns>
-        public static AcsChatThreadPropertiesUpdatedPerUserEventData AcsChatThreadPropertiesUpdatedPerUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null, CommunicationIdentifierModel editedByCommunicationIdentifier = null, DateTimeOffset editTime = default, IReadOnlyDictionary<string, string> metadata = null, IReadOnlyDictionary<string, BinaryData> properties = null)
-        {
-            metadata ??= new Dictionary<string, string>();
-            properties ??= new Dictionary<string, BinaryData>();
-
-            return new AcsChatThreadPropertiesUpdatedPerUserEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version,
-                editedByCommunicationIdentifier,
-                editTime,
-                metadata,
-                properties);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatThreadPropertiesUpdatedEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="editedByCommunicationIdentifier"> The communication identifier of the user who updated the thread properties. </param>
-        /// <param name="editTime"> The time at which the properties of the thread were updated. </param>
-        /// <param name="properties"> The updated thread properties. </param>
-        /// <param name="metadata"> The thread metadata. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatThreadPropertiesUpdatedEventData"/> instance for mocking. </returns>
-        public static AcsChatThreadPropertiesUpdatedEventData AcsChatThreadPropertiesUpdatedEventData(string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null, CommunicationIdentifierModel editedByCommunicationIdentifier = null, DateTimeOffset editTime = default, IReadOnlyDictionary<string, BinaryData> properties = null, IReadOnlyDictionary<string, string> metadata = null)
-        {
-            properties ??= new Dictionary<string, BinaryData>();
-            metadata ??= new Dictionary<string, string>();
-
-            return new AcsChatThreadPropertiesUpdatedEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version,
-                editedByCommunicationIdentifier,
-                editTime,
-                properties,
-                metadata);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatParticipantAddedToThreadWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="time"> The time at which the user was added to the thread. </param>
-        /// <param name="addedByCommunicationIdentifier"> The communication identifier of the user who added the user. </param>
-        /// <param name="participantAdded"> The details of the user who was added. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatParticipantAddedToThreadWithUserEventData"/> instance for mocking. </returns>
-        public static AcsChatParticipantAddedToThreadWithUserEventData AcsChatParticipantAddedToThreadWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null, DateTimeOffset time = default, CommunicationIdentifierModel addedByCommunicationIdentifier = null, AcsChatThreadParticipantProperties participantAdded = null)
-        {
-            return new AcsChatParticipantAddedToThreadWithUserEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version,
-                time,
-                addedByCommunicationIdentifier,
-                participantAdded);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatParticipantRemovedFromThreadWithUserEventData"/>. </summary>
-        /// <param name="recipientCommunicationIdentifier"> The communication identifier of the target user. </param>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="createTime"> The original creation time of the thread. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <param name="time"> The time at which the user was removed to the thread. </param>
-        /// <param name="removedByCommunicationIdentifier"> The communication identifier of the user who removed the user. </param>
-        /// <param name="participantRemoved"> The details of the user who was removed. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatParticipantRemovedFromThreadWithUserEventData"/> instance for mocking. </returns>
-        public static AcsChatParticipantRemovedFromThreadWithUserEventData AcsChatParticipantRemovedFromThreadWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier = null, string transactionId = null, string threadId = null, DateTimeOffset createTime = default, long? version = null, DateTimeOffset time = default, CommunicationIdentifierModel removedByCommunicationIdentifier = null, AcsChatThreadParticipantProperties participantRemoved = null)
-        {
-            return new AcsChatParticipantRemovedFromThreadWithUserEventData(
-                recipientCommunicationIdentifier,
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                createTime,
-                version,
-                time,
-                removedByCommunicationIdentifier,
-                participantRemoved);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatParticipantAddedToThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="time"> The time at which the user was added to the thread. </param>
-        /// <param name="addedByCommunicationIdentifier"> The communication identifier of the user who added the user. </param>
-        /// <param name="participantAdded"> The details of the user who was added. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatParticipantAddedToThreadEventData"/> instance for mocking. </returns>
-        public static AcsChatParticipantAddedToThreadEventData AcsChatParticipantAddedToThreadEventData(string transactionId = null, string threadId = null, DateTimeOffset time = default, CommunicationIdentifierModel addedByCommunicationIdentifier = null, AcsChatThreadParticipantProperties participantAdded = null, long? version = null)
-        {
-            return new AcsChatParticipantAddedToThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                time,
-                addedByCommunicationIdentifier,
-                participantAdded,
-                version);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsChatParticipantRemovedFromThreadEventData"/>. </summary>
-        /// <param name="transactionId"> The transaction id will be used as co-relation vector. </param>
-        /// <param name="threadId"> The chat thread id. </param>
-        /// <param name="time"> The time at which the user was removed to the thread. </param>
-        /// <param name="removedByCommunicationIdentifier"> The communication identifier of the user who removed the user. </param>
-        /// <param name="participantRemoved"> The details of the user who was removed. </param>
-        /// <param name="version"> The version of the thread. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsChatParticipantRemovedFromThreadEventData"/> instance for mocking. </returns>
-        public static AcsChatParticipantRemovedFromThreadEventData AcsChatParticipantRemovedFromThreadEventData(string transactionId = null, string threadId = null, DateTimeOffset time = default, CommunicationIdentifierModel removedByCommunicationIdentifier = null, AcsChatThreadParticipantProperties participantRemoved = null, long? version = null)
-        {
-            return new AcsChatParticipantRemovedFromThreadEventData(
-                transactionId,
-                threadId,
-                serializedAdditionalRawData: null,
-                time,
-                removedByCommunicationIdentifier,
-                participantRemoved,
-                version);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsSmsEventBaseProperties"/>. </summary>
-        /// <param name="messageId"> The identity of the SMS message. </param>
-        /// <param name="from"> The identity of SMS message sender. </param>
-        /// <param name="to"> The identity of SMS message receiver. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsSmsEventBaseProperties"/> instance for mocking. </returns>
-        public static AcsSmsEventBaseProperties AcsSmsEventBaseProperties(string messageId = null, string @from = null, string to = null)
-        {
-            return new AcsSmsEventBaseProperties(messageId, @from, to, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsSmsDeliveryReportReceivedEventData"/>. </summary>
-        /// <param name="messageId"> The identity of the SMS message. </param>
-        /// <param name="from"> The identity of SMS message sender. </param>
-        /// <param name="to"> The identity of SMS message receiver. </param>
-        /// <param name="deliveryStatus"> Status of Delivery. </param>
-        /// <param name="deliveryStatusDetails"> Details about Delivery Status. </param>
-        /// <param name="deliveryAttempts"> List of details of delivery attempts made. </param>
-        /// <param name="receivedTimestamp"> The time at which the SMS delivery report was received. </param>
-        /// <param name="tag"> Customer Content. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsSmsDeliveryReportReceivedEventData"/> instance for mocking. </returns>
-        public static AcsSmsDeliveryReportReceivedEventData AcsSmsDeliveryReportReceivedEventData(string messageId = null, string @from = null, string to = null, string deliveryStatus = null, string deliveryStatusDetails = null, IEnumerable<AcsSmsDeliveryAttemptProperties> deliveryAttempts = null, DateTimeOffset receivedTimestamp = default, string tag = null)
-        {
-            deliveryAttempts ??= new List<AcsSmsDeliveryAttemptProperties>();
-
-            return new AcsSmsDeliveryReportReceivedEventData(
-                messageId,
-                @from,
-                to,
-                serializedAdditionalRawData: null,
-                deliveryStatus,
-                deliveryStatusDetails,
-                deliveryAttempts?.ToList(),
-                receivedTimestamp,
-                tag);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsSmsDeliveryAttemptProperties"/>. </summary>
-        /// <param name="timestamp"> TimeStamp when delivery was attempted. </param>
-        /// <param name="segmentsSucceeded"> Number of segments that were successfully delivered. </param>
-        /// <param name="segmentsFailed"> Number of segments whose delivery failed. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsSmsDeliveryAttemptProperties"/> instance for mocking. </returns>
-        public static AcsSmsDeliveryAttemptProperties AcsSmsDeliveryAttemptProperties(DateTimeOffset timestamp = default, int? segmentsSucceeded = null, int? segmentsFailed = null)
-        {
-            return new AcsSmsDeliveryAttemptProperties(timestamp, segmentsSucceeded, segmentsFailed, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsSmsReceivedEventData"/>. </summary>
-        /// <param name="messageId"> The identity of the SMS message. </param>
-        /// <param name="from"> The identity of SMS message sender. </param>
-        /// <param name="to"> The identity of SMS message receiver. </param>
-        /// <param name="message"> The SMS content. </param>
-        /// <param name="receivedTimestamp"> The time at which the SMS was received. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsSmsReceivedEventData"/> instance for mocking. </returns>
-        public static AcsSmsReceivedEventData AcsSmsReceivedEventData(string messageId = null, string @from = null, string to = null, string message = null, DateTimeOffset receivedTimestamp = default)
-        {
-            return new AcsSmsReceivedEventData(
-                messageId,
-                @from,
-                to,
-                serializedAdditionalRawData: null,
-                message,
-                receivedTimestamp);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRecordingFileStatusUpdatedEventData"/>. </summary>
-        /// <param name="recordingStorageInfo"> The details of recording storage information. </param>
-        /// <param name="recordingStartTime"> The time at which the recording started. </param>
-        /// <param name="recordingDurationMs"> The recording duration in milliseconds. </param>
-        /// <param name="recordingContentType"> The recording content type- AudioVideo, or Audio. </param>
-        /// <param name="recordingChannelKind"> The recording  channel type - Mixed, Unmixed. </param>
-        /// <param name="recordingFormatType"> The recording format type - Mp4, Mp3, Wav. </param>
-        /// <param name="sessionEndReason"> The reason for ending recording session. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRecordingFileStatusUpdatedEventData"/> instance for mocking. </returns>
-        public static AcsRecordingFileStatusUpdatedEventData AcsRecordingFileStatusUpdatedEventData(AcsRecordingStorageInfoProperties recordingStorageInfo = null, DateTimeOffset recordingStartTime = default, long? recordingDurationMs = null, RecordingContentType recordingContentType = default, RecordingChannelType recordingChannelKind = default, RecordingFormatType recordingFormatType = default, string sessionEndReason = null)
-        {
-            return new AcsRecordingFileStatusUpdatedEventData(
-                recordingStorageInfo,
-                recordingStartTime,
-                recordingDurationMs,
-                recordingContentType,
-                recordingChannelKind,
-                recordingFormatType,
-                sessionEndReason,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRecordingStorageInfoProperties"/>. </summary>
-        /// <param name="recordingChunks"> List of details of recording chunks information. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRecordingStorageInfoProperties"/> instance for mocking. </returns>
-        public static AcsRecordingStorageInfoProperties AcsRecordingStorageInfoProperties(IEnumerable<AcsRecordingChunkInfoProperties> recordingChunks = null)
-        {
-            recordingChunks ??= new List<AcsRecordingChunkInfoProperties>();
-
-            return new AcsRecordingStorageInfoProperties(recordingChunks?.ToList(), serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRecordingChunkInfoProperties"/>. </summary>
-        /// <param name="documentId"> The documentId of the recording chunk. </param>
-        /// <param name="index"> The index of the recording chunk. </param>
-        /// <param name="endReason"> The reason for ending the recording chunk. </param>
-        /// <param name="metadataLocation"> The location of the metadata for this chunk. </param>
-        /// <param name="contentLocation"> The location of the content for this chunk. </param>
-        /// <param name="deleteLocation"> The location to delete all chunk storage. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRecordingChunkInfoProperties"/> instance for mocking. </returns>
-        public static AcsRecordingChunkInfoProperties AcsRecordingChunkInfoProperties(string documentId = null, long? index = null, string endReason = null, string metadataLocation = null, string contentLocation = null, string deleteLocation = null)
-        {
-            return new AcsRecordingChunkInfoProperties(
-                documentId,
-                index,
-                endReason,
-                metadataLocation,
-                contentLocation,
-                deleteLocation,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsEmailDeliveryReportReceivedEventData"/>. </summary>
-        /// <param name="sender"> The Sender Email Address. </param>
-        /// <param name="recipient"> The recipient Email Address. </param>
-        /// <param name="messageId"> The Id of the email been sent. </param>
-        /// <param name="status"> The status of the email. Any value other than Delivered is considered failed. </param>
-        /// <param name="deliveryStatusDetails"> Detailed information about the status if any. </param>
-        /// <param name="deliveryAttemptTimestamp"> The time at which the email delivery report received timestamp. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsEmailDeliveryReportReceivedEventData"/> instance for mocking. </returns>
-        public static AcsEmailDeliveryReportReceivedEventData AcsEmailDeliveryReportReceivedEventData(string sender = null, string recipient = null, string messageId = null, AcsEmailDeliveryReportStatus status = default, AcsEmailDeliveryReportStatusDetails deliveryStatusDetails = null, DateTimeOffset deliveryAttemptTimestamp = default)
-        {
-            return new AcsEmailDeliveryReportReceivedEventData(
-                sender,
-                recipient,
-                messageId,
-                status,
-                deliveryStatusDetails,
-                deliveryAttemptTimestamp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsEmailDeliveryReportStatusDetails"/>. </summary>
-        /// <param name="statusMessage"> Detailed status message. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsEmailDeliveryReportStatusDetails"/> instance for mocking. </returns>
-        public static AcsEmailDeliveryReportStatusDetails AcsEmailDeliveryReportStatusDetails(string statusMessage = null)
-        {
-            return new AcsEmailDeliveryReportStatusDetails(statusMessage, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsEmailEngagementTrackingReportReceivedEventData"/>. </summary>
-        /// <param name="sender"> The Sender Email Address. </param>
-        /// <param name="recipient"> The Recipient Email Address. </param>
-        /// <param name="messageId"> The Id of the email that has been sent. </param>
-        /// <param name="userActionTimestamp"> The time at which the user interacted with the email. </param>
-        /// <param name="engagementContext"> The context of the type of engagement user had with email. </param>
-        /// <param name="userAgent"> The user agent interacting with the email. </param>
-        /// <param name="engagement"> The type of engagement user have with email. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsEmailEngagementTrackingReportReceivedEventData"/> instance for mocking. </returns>
-        public static AcsEmailEngagementTrackingReportReceivedEventData AcsEmailEngagementTrackingReportReceivedEventData(string sender = null, string recipient = null, string messageId = null, DateTimeOffset userActionTimestamp = default, string engagementContext = null, string userAgent = null, AcsUserEngagement engagement = default)
-        {
-            return new AcsEmailEngagementTrackingReportReceivedEventData(
-                sender,
-                recipient,
-                messageId,
-                userActionTimestamp,
-                engagementContext,
-                userAgent,
-                engagement,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterEventData"/> instance for mocking. </returns>
-        public static AcsRouterEventData AcsRouterEventData(string jobId = null, string channelReference = null, string channelId = null)
-        {
-            return new AcsRouterEventData(jobId, channelReference, channelId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobEventData AcsRouterJobEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-
-            return new AcsRouterJobEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobCancelledEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="note"> Router Job Note. </param>
-        /// <param name="dispositionCode"> Router Job Disposition Code. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobCancelledEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobCancelledEventData AcsRouterJobCancelledEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, string note = null, string dispositionCode = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-
-            return new AcsRouterJobCancelledEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                note,
-                dispositionCode);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobClassificationFailedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="classificationPolicyId"> Router Job Classification Policy Id. </param>
-        /// <param name="errors"> Router Job Classification Failed Errors. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobClassificationFailedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobClassificationFailedEventData AcsRouterJobClassificationFailedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, string classificationPolicyId = null, IEnumerable<AcsRouterCommunicationError> errors = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-            errors ??= new List<AcsRouterCommunicationError>();
-
-            return new AcsRouterJobClassificationFailedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                classificationPolicyId,
-                errors?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterCommunicationError"/>. </summary>
-        /// <param name="code"> Router Communication Error Code. </param>
-        /// <param name="message"> Router Communication Error Message. </param>
-        /// <param name="target"> Router Communication Error Target. </param>
-        /// <param name="innererror"> Router Communication Inner Error. </param>
-        /// <param name="details"> List of Router Communication Errors. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterCommunicationError"/> instance for mocking. </returns>
-        public static AcsRouterCommunicationError AcsRouterCommunicationError(string code = null, string message = null, string target = null, AcsRouterCommunicationError innererror = null, IEnumerable<AcsRouterCommunicationError> details = null)
-        {
-            details ??= new List<AcsRouterCommunicationError>();
-
-            return new AcsRouterCommunicationError(
-                code,
-                message,
-                target,
-                innererror,
-                details?.ToList(),
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobClassifiedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="queueDetails"> Router Job Queue Info. </param>
-        /// <param name="classificationPolicyId"> Router Job Classification Policy Id. </param>
-        /// <param name="priority"> Router Job Priority. </param>
-        /// <param name="attachedWorkerSelectors"> Router Job Attached Worker Selector. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobClassifiedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobClassifiedEventData AcsRouterJobClassifiedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, AcsRouterQueueDetails queueDetails = null, string classificationPolicyId = null, int? priority = null, IEnumerable<AcsRouterWorkerSelector> attachedWorkerSelectors = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-            attachedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-
-            return new AcsRouterJobClassifiedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                queueDetails,
-                classificationPolicyId,
-                priority,
-                attachedWorkerSelectors?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterQueueDetails"/>. </summary>
-        /// <param name="id"> Router Queue Id. </param>
-        /// <param name="name"> Router Queue Name. </param>
-        /// <param name="labels"> Router Queue Labels. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterQueueDetails"/> instance for mocking. </returns>
-        public static AcsRouterQueueDetails AcsRouterQueueDetails(string id = null, string name = null, IReadOnlyDictionary<string, string> labels = null)
-        {
-            labels ??= new Dictionary<string, string>();
-
-            return new AcsRouterQueueDetails(id, name, labels, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerSelector"/>. </summary>
-        /// <param name="key"> Router Job Worker Selector Key. </param>
-        /// <param name="labelOperator"> Router Job Worker Selector Label Operator. </param>
-        /// <param name="labelValue"> Router Job Worker Selector Value. </param>
-        /// <param name="timeToLive"> Router Job Worker Selector Time to Live in Seconds. </param>
-        /// <param name="selectorState"> Router Job Worker Selector State. </param>
-        /// <param name="expirationTime"> Router Job Worker Selector Expiration Time. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerSelector"/> instance for mocking. </returns>
-        public static AcsRouterWorkerSelector AcsRouterWorkerSelector(string key = null, AcsRouterLabelOperator labelOperator = default, BinaryData labelValue = null, double timeToLive = default, AcsRouterWorkerSelectorState selectorState = default, DateTimeOffset expirationTime = default)
-        {
-            return new AcsRouterWorkerSelector(
-                key,
-                labelOperator,
-                labelValue,
-                timeToLive,
-                selectorState,
-                expirationTime,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobClosedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="assignmentId"> Router Job Closed Assignment Id. </param>
-        /// <param name="workerId"> Router Job Closed Worker Id. </param>
-        /// <param name="dispositionCode"> Router Job Closed Disposition Code. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobClosedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobClosedEventData AcsRouterJobClosedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, string assignmentId = null, string workerId = null, string dispositionCode = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-
-            return new AcsRouterJobClosedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                assignmentId,
-                workerId,
-                dispositionCode);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobCompletedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="assignmentId"> Router Job Completed Assignment Id. </param>
-        /// <param name="workerId"> Router Job Completed Worker Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobCompletedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobCompletedEventData AcsRouterJobCompletedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, string assignmentId = null, string workerId = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-
-            return new AcsRouterJobCompletedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                assignmentId,
-                workerId);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobDeletedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobDeletedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobDeletedEventData AcsRouterJobDeletedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-
-            return new AcsRouterJobDeletedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobExceptionTriggeredEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="ruleKey"> Router Job Exception Triggered Rule Key. </param>
-        /// <param name="exceptionRuleId"> Router Job Exception Triggered Rule Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobExceptionTriggeredEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobExceptionTriggeredEventData AcsRouterJobExceptionTriggeredEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, string ruleKey = null, string exceptionRuleId = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-
-            return new AcsRouterJobExceptionTriggeredEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                ruleKey,
-                exceptionRuleId);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobQueuedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="priority"> Router Job Priority. </param>
-        /// <param name="attachedWorkerSelectors"> Router Job Queued Attached Worker Selector. </param>
-        /// <param name="requestedWorkerSelectors"> Router Job Queued Requested Worker Selector. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobQueuedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobQueuedEventData AcsRouterJobQueuedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, int? priority = null, IEnumerable<AcsRouterWorkerSelector> attachedWorkerSelectors = null, IEnumerable<AcsRouterWorkerSelector> requestedWorkerSelectors = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-            attachedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-            requestedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-
-            return new AcsRouterJobQueuedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                priority,
-                attachedWorkerSelectors?.ToList(),
-                requestedWorkerSelectors?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobReceivedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="jobStatus"> Router Job Received Job Status. </param>
-        /// <param name="classificationPolicyId"> Router Job Classification Policy Id. </param>
-        /// <param name="priority"> Router Job Priority. </param>
-        /// <param name="requestedWorkerSelectors"> Router Job Received Requested Worker Selectors. </param>
-        /// <param name="scheduledOn"> Router Job Received Scheduled Time in UTC. </param>
-        /// <param name="unavailableForMatching"> Unavailable For Matching for Router Job Received. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobReceivedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobReceivedEventData AcsRouterJobReceivedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, AcsRouterJobStatus jobStatus = default, string classificationPolicyId = null, int? priority = null, IEnumerable<AcsRouterWorkerSelector> requestedWorkerSelectors = null, DateTimeOffset scheduledOn = default, bool unavailableForMatching = default)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-            requestedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-
-            return new AcsRouterJobReceivedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                jobStatus,
-                classificationPolicyId,
-                priority,
-                requestedWorkerSelectors?.ToList(),
-                scheduledOn,
-                unavailableForMatching);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobSchedulingFailedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="priority"> Router Job Priority. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Scheduling Failed Attached Worker Selector Expired. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Scheduling Failed Requested Worker Selector Expired. </param>
-        /// <param name="scheduledOn"> Router Job Scheduling Failed Scheduled Time in UTC. </param>
-        /// <param name="failureReason"> Router Job Scheduling Failed Reason. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobSchedulingFailedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobSchedulingFailedEventData AcsRouterJobSchedulingFailedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, int? priority = null, IEnumerable<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors = null, IEnumerable<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors = null, DateTimeOffset scheduledOn = default, string failureReason = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-            expiredAttachedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-            expiredRequestedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-
-            return new AcsRouterJobSchedulingFailedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                priority,
-                expiredAttachedWorkerSelectors?.ToList(),
-                expiredRequestedWorkerSelectors?.ToList(),
-                scheduledOn,
-                failureReason);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobUnassignedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="assignmentId"> Router Job Unassigned Assignment Id. </param>
-        /// <param name="workerId"> Router Job Unassigned Worker Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobUnassignedEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobUnassignedEventData AcsRouterJobUnassignedEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, string assignmentId = null, string workerId = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-
-            return new AcsRouterJobUnassignedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                assignmentId,
-                workerId);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobWaitingForActivationEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="priority"> Router Job Waiting For Activation Priority. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Waiting For Activation Worker Selector Expired. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Waiting For Activation Requested Worker Selector Expired. </param>
-        /// <param name="scheduledOn"> Router Job Waiting For Activation Scheduled Time in UTC. </param>
-        /// <param name="unavailableForMatching"> Router Job Waiting For Activation Unavailable For Matching. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobWaitingForActivationEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobWaitingForActivationEventData AcsRouterJobWaitingForActivationEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, int? priority = null, IEnumerable<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors = null, IEnumerable<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors = null, DateTimeOffset scheduledOn = default, bool unavailableForMatching = default)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-            expiredAttachedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-            expiredRequestedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-
-            return new AcsRouterJobWaitingForActivationEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                priority,
-                expiredAttachedWorkerSelectors?.ToList(),
-                expiredRequestedWorkerSelectors?.ToList(),
-                scheduledOn,
-                unavailableForMatching);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterJobWorkerSelectorsExpiredEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="queueId"> Router Job events Queue Id. </param>
-        /// <param name="labels"> Router Job events Labels. </param>
-        /// <param name="tags"> Router Jobs events Tags. </param>
-        /// <param name="expiredRequestedWorkerSelectors"> Router Job Worker Selectors Expired Requested Worker Selectors. </param>
-        /// <param name="expiredAttachedWorkerSelectors"> Router Job Worker Selectors Expired Attached Worker Selectors. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterJobWorkerSelectorsExpiredEventData"/> instance for mocking. </returns>
-        public static AcsRouterJobWorkerSelectorsExpiredEventData AcsRouterJobWorkerSelectorsExpiredEventData(string jobId = null, string channelReference = null, string channelId = null, string queueId = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, IEnumerable<AcsRouterWorkerSelector> expiredRequestedWorkerSelectors = null, IEnumerable<AcsRouterWorkerSelector> expiredAttachedWorkerSelectors = null)
-        {
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-            expiredRequestedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-            expiredAttachedWorkerSelectors ??= new List<AcsRouterWorkerSelector>();
-
-            return new AcsRouterJobWorkerSelectorsExpiredEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                queueId,
-                labels,
-                tags,
-                expiredRequestedWorkerSelectors?.ToList(),
-                expiredAttachedWorkerSelectors?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerEventData AcsRouterWorkerEventData(string jobId = null, string channelReference = null, string channelId = null, string workerId = null)
-        {
-            return new AcsRouterWorkerEventData(jobId, channelReference, channelId, serializedAdditionalRawData: null, workerId);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerDeletedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerDeletedEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerDeletedEventData AcsRouterWorkerDeletedEventData(string jobId = null, string channelReference = null, string channelId = null, string workerId = null)
-        {
-            return new AcsRouterWorkerDeletedEventData(jobId, channelReference, channelId, serializedAdditionalRawData: null, workerId);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerDeregisteredEventData"/>. </summary>
-        /// <param name="workerId"> Router Worker Deregistered Worker Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerDeregisteredEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerDeregisteredEventData AcsRouterWorkerDeregisteredEventData(string workerId = null)
-        {
-            return new AcsRouterWorkerDeregisteredEventData(workerId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerOfferAcceptedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Accepted Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Accepted Offer Id. </param>
-        /// <param name="assignmentId"> Router Worker Offer Accepted Assignment Id. </param>
-        /// <param name="jobPriority"> Router Worker Offer Accepted Job Priority. </param>
-        /// <param name="workerLabels"> Router Worker Offer Accepted Worker Labels. </param>
-        /// <param name="workerTags"> Router Worker Offer Accepted Worker Tags. </param>
-        /// <param name="jobLabels"> Router Worker Offer Accepted Job Labels. </param>
-        /// <param name="jobTags"> Router Worker Offer Accepted Job Tags. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerOfferAcceptedEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerOfferAcceptedEventData AcsRouterWorkerOfferAcceptedEventData(string jobId = null, string channelReference = null, string channelId = null, string workerId = null, string queueId = null, string offerId = null, string assignmentId = null, int? jobPriority = null, IReadOnlyDictionary<string, string> workerLabels = null, IReadOnlyDictionary<string, string> workerTags = null, IReadOnlyDictionary<string, string> jobLabels = null, IReadOnlyDictionary<string, string> jobTags = null)
-        {
-            workerLabels ??= new Dictionary<string, string>();
-            workerTags ??= new Dictionary<string, string>();
-            jobLabels ??= new Dictionary<string, string>();
-            jobTags ??= new Dictionary<string, string>();
-
-            return new AcsRouterWorkerOfferAcceptedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                workerId,
-                queueId,
-                offerId,
-                assignmentId,
-                jobPriority,
-                workerLabels,
-                workerTags,
-                jobLabels,
-                jobTags);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerOfferDeclinedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Declined Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Declined Offer Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerOfferDeclinedEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerOfferDeclinedEventData AcsRouterWorkerOfferDeclinedEventData(string jobId = null, string channelReference = null, string channelId = null, string workerId = null, string queueId = null, string offerId = null)
-        {
-            return new AcsRouterWorkerOfferDeclinedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                workerId,
-                queueId,
-                offerId);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerOfferExpiredEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Expired Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Expired Offer Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerOfferExpiredEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerOfferExpiredEventData AcsRouterWorkerOfferExpiredEventData(string jobId = null, string channelReference = null, string channelId = null, string workerId = null, string queueId = null, string offerId = null)
-        {
-            return new AcsRouterWorkerOfferExpiredEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                workerId,
-                queueId,
-                offerId);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerOfferIssuedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Issued Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Issued Offer Id. </param>
-        /// <param name="jobPriority"> Router Worker Offer Issued Job Priority. </param>
-        /// <param name="workerLabels"> Router Worker Offer Issued Worker Labels. </param>
-        /// <param name="offeredOn"> Router Worker Offer Issued Time in UTC. </param>
-        /// <param name="expiresOn"> Router Worker Offer Issued Expiration Time in UTC. </param>
-        /// <param name="workerTags"> Router Worker Offer Issued Worker Tags. </param>
-        /// <param name="jobLabels"> Router Worker Offer Issued Job Labels. </param>
-        /// <param name="jobTags"> Router Worker Offer Issued Job Tags. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerOfferIssuedEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerOfferIssuedEventData AcsRouterWorkerOfferIssuedEventData(string jobId = null, string channelReference = null, string channelId = null, string workerId = null, string queueId = null, string offerId = null, int? jobPriority = null, IReadOnlyDictionary<string, string> workerLabels = null, DateTimeOffset offeredOn = default, DateTimeOffset expiresOn = default, IReadOnlyDictionary<string, string> workerTags = null, IReadOnlyDictionary<string, string> jobLabels = null, IReadOnlyDictionary<string, string> jobTags = null)
-        {
-            workerLabels ??= new Dictionary<string, string>();
-            workerTags ??= new Dictionary<string, string>();
-            jobLabels ??= new Dictionary<string, string>();
-            jobTags ??= new Dictionary<string, string>();
-
-            return new AcsRouterWorkerOfferIssuedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                workerId,
-                queueId,
-                offerId,
-                jobPriority,
-                workerLabels,
-                offeredOn,
-                expiresOn,
-                workerTags,
-                jobLabels,
-                jobTags);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerOfferRevokedEventData"/>. </summary>
-        /// <param name="jobId"> Router Event Job ID. </param>
-        /// <param name="channelReference"> Router Event Channel Reference. </param>
-        /// <param name="channelId"> Router Event Channel ID. </param>
-        /// <param name="workerId"> Router Worker events Worker Id. </param>
-        /// <param name="queueId"> Router Worker Offer Revoked Queue Id. </param>
-        /// <param name="offerId"> Router Worker Offer Revoked Offer Id. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerOfferRevokedEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerOfferRevokedEventData AcsRouterWorkerOfferRevokedEventData(string jobId = null, string channelReference = null, string channelId = null, string workerId = null, string queueId = null, string offerId = null)
-        {
-            return new AcsRouterWorkerOfferRevokedEventData(
-                jobId,
-                channelReference,
-                channelId,
-                serializedAdditionalRawData: null,
-                workerId,
-                queueId,
-                offerId);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerRegisteredEventData"/>. </summary>
-        /// <param name="workerId"> Router Worker Registered Worker Id. </param>
-        /// <param name="queueAssignments"> Router Worker Registered Queue Info. </param>
-        /// <param name="channelConfigurations"> Router Worker Registered Channel Configuration. </param>
-        /// <param name="totalCapacity"> Router Worker Register Total Capacity. </param>
-        /// <param name="labels"> Router Worker Registered Labels. </param>
-        /// <param name="tags"> Router Worker Registered Tags. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerRegisteredEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerRegisteredEventData AcsRouterWorkerRegisteredEventData(string workerId = null, IEnumerable<AcsRouterQueueDetails> queueAssignments = null, IEnumerable<AcsRouterChannelConfiguration> channelConfigurations = null, int? totalCapacity = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null)
-        {
-            queueAssignments ??= new List<AcsRouterQueueDetails>();
-            channelConfigurations ??= new List<AcsRouterChannelConfiguration>();
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-
-            return new AcsRouterWorkerRegisteredEventData(
-                workerId,
-                queueAssignments?.ToList(),
-                channelConfigurations?.ToList(),
-                totalCapacity,
-                labels,
-                tags,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterChannelConfiguration"/>. </summary>
-        /// <param name="channelId"> Channel ID for Router Job. </param>
-        /// <param name="capacityCostPerJob"> Capacity Cost Per Job for Router Job. </param>
-        /// <param name="maxNumberOfJobs"> Max Number of Jobs for Router Job. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterChannelConfiguration"/> instance for mocking. </returns>
-        public static AcsRouterChannelConfiguration AcsRouterChannelConfiguration(string channelId = null, int? capacityCostPerJob = null, int? maxNumberOfJobs = null)
-        {
-            return new AcsRouterChannelConfiguration(channelId, capacityCostPerJob, maxNumberOfJobs, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsRouterWorkerUpdatedEventData"/>. </summary>
-        /// <param name="workerId"> Router Worker Updated Worker Id. </param>
-        /// <param name="queueAssignments"> Router Worker Updated Queue Info. </param>
-        /// <param name="channelConfigurations"> Router Worker Updated Channel Configuration. </param>
-        /// <param name="totalCapacity"> Router Worker Updated Total Capacity. </param>
-        /// <param name="labels"> Router Worker Updated Labels. </param>
-        /// <param name="tags"> Router Worker Updated Tags. </param>
-        /// <param name="updatedWorkerProperties"> Router Worker Properties Updated. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsRouterWorkerUpdatedEventData"/> instance for mocking. </returns>
-        public static AcsRouterWorkerUpdatedEventData AcsRouterWorkerUpdatedEventData(string workerId = null, IEnumerable<AcsRouterQueueDetails> queueAssignments = null, IEnumerable<AcsRouterChannelConfiguration> channelConfigurations = null, int? totalCapacity = null, IReadOnlyDictionary<string, string> labels = null, IReadOnlyDictionary<string, string> tags = null, IEnumerable<AcsRouterUpdatedWorkerProperty> updatedWorkerProperties = null)
-        {
-            queueAssignments ??= new List<AcsRouterQueueDetails>();
-            channelConfigurations ??= new List<AcsRouterChannelConfiguration>();
-            labels ??= new Dictionary<string, string>();
-            tags ??= new Dictionary<string, string>();
-            updatedWorkerProperties ??= new List<AcsRouterUpdatedWorkerProperty>();
-
-            return new AcsRouterWorkerUpdatedEventData(
-                workerId,
-                queueAssignments?.ToList(),
-                channelConfigurations?.ToList(),
-                totalCapacity,
-                labels,
-                tags,
-                updatedWorkerProperties?.ToList(),
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageEventData"/>. </summary>
-        /// <param name="from"> The message sender. </param>
-        /// <param name="to"> The message recipient. </param>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageEventData"/> instance for mocking. </returns>
-        public static AcsMessageEventData AcsMessageEventData(string @from = null, string to = null, DateTimeOffset receivedTimestamp = default, AcsMessageChannelEventError error = null)
-        {
-            return new AcsMessageEventData(@from, to, receivedTimestamp, error, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageChannelEventError"/>. </summary>
-        /// <param name="channelCode"> The channel error code. </param>
-        /// <param name="channelMessage"> The channel error message. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageChannelEventError"/> instance for mocking. </returns>
-        public static AcsMessageChannelEventError AcsMessageChannelEventError(string channelCode = null, string channelMessage = null)
-        {
-            return new AcsMessageChannelEventError(channelCode, channelMessage, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageDeliveryStatusUpdatedEventData"/>. </summary>
-        /// <param name="from"> The message sender. </param>
-        /// <param name="to"> The message recipient. </param>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <param name="messageId"> The message id. </param>
-        /// <param name="status"> The updated message status. </param>
-        /// <param name="channelKind"> The updated message channel type. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageDeliveryStatusUpdatedEventData"/> instance for mocking. </returns>
-        public static AcsMessageDeliveryStatusUpdatedEventData AcsMessageDeliveryStatusUpdatedEventData(string @from = null, string to = null, DateTimeOffset receivedTimestamp = default, AcsMessageChannelEventError error = null, string messageId = null, AcsMessageDeliveryStatus status = default, AcsMessageChannelKind channelKind = default)
-        {
-            return new AcsMessageDeliveryStatusUpdatedEventData(
-                @from,
-                to,
-                receivedTimestamp,
-                error,
-                serializedAdditionalRawData: null,
-                messageId,
-                status,
-                channelKind);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageReceivedEventData"/>. </summary>
-        /// <param name="from"> The message sender. </param>
-        /// <param name="to"> The message recipient. </param>
-        /// <param name="receivedTimestamp"> The time message was received. </param>
-        /// <param name="error"> The channel event error. </param>
-        /// <param name="content"> The message content. </param>
-        /// <param name="channelKind"> The message channel type. </param>
-        /// <param name="mediaContent"> The received message media content. </param>
-        /// <param name="context"> The received message context. </param>
-        /// <param name="button"> The received message button content. </param>
-        /// <param name="interactiveContent"> The received message interactive content. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageReceivedEventData"/> instance for mocking. </returns>
-        public static AcsMessageReceivedEventData AcsMessageReceivedEventData(string @from = null, string to = null, DateTimeOffset receivedTimestamp = default, AcsMessageChannelEventError error = null, string content = null, AcsMessageChannelKind channelKind = default, AcsMessageMediaContent mediaContent = null, AcsMessageContext context = null, AcsMessageButtonContent button = null, AcsMessageInteractiveContent interactiveContent = null)
-        {
-            return new AcsMessageReceivedEventData(
-                @from,
-                to,
-                receivedTimestamp,
-                error,
-                serializedAdditionalRawData: null,
-                content,
-                channelKind,
-                mediaContent,
-                context,
-                button,
-                interactiveContent);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageMediaContent"/>. </summary>
-        /// <param name="mimeType"> The MIME type of the file this media represents. </param>
-        /// <param name="mediaId"> The media identifier. </param>
-        /// <param name="fileName"> The filename of the underlying media file as specified when uploaded. </param>
-        /// <param name="caption"> The caption for the media object, if supported and provided. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageMediaContent"/> instance for mocking. </returns>
-        public static AcsMessageMediaContent AcsMessageMediaContent(string mimeType = null, string mediaId = null, string fileName = null, string caption = null)
-        {
-            return new AcsMessageMediaContent(mimeType, mediaId, fileName, caption, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageContext"/>. </summary>
-        /// <param name="from"> The WhatsApp ID for the customer who replied to an inbound message. </param>
-        /// <param name="messageId"> The message ID for the sent message for an inbound reply. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageContext"/> instance for mocking. </returns>
-        public static AcsMessageContext AcsMessageContext(string @from = null, string messageId = null)
-        {
-            return new AcsMessageContext(@from, messageId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageButtonContent"/>. </summary>
-        /// <param name="text"> The Text of the button. </param>
-        /// <param name="payload"> The Payload of the button which was clicked by the user, setup by the business. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageButtonContent"/> instance for mocking. </returns>
-        public static AcsMessageButtonContent AcsMessageButtonContent(string text = null, string payload = null)
-        {
-            return new AcsMessageButtonContent(text, payload, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageInteractiveContent"/>. </summary>
-        /// <param name="replyKind"> The Message interactive reply type. </param>
-        /// <param name="buttonReply"> The Message Sent when a customer clicks a button. </param>
-        /// <param name="listReply"> The Message Sent when a customer selects an item from a list. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageInteractiveContent"/> instance for mocking. </returns>
-        public static AcsMessageInteractiveContent AcsMessageInteractiveContent(AcsInteractiveReplyKind replyKind = default, AcsMessageInteractiveButtonReplyContent buttonReply = null, AcsMessageInteractiveListReplyContent listReply = null)
-        {
-            return new AcsMessageInteractiveContent(replyKind, buttonReply, listReply, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageInteractiveButtonReplyContent"/>. </summary>
-        /// <param name="buttonId"> The ID of the button. </param>
-        /// <param name="title"> The title of the button. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageInteractiveButtonReplyContent"/> instance for mocking. </returns>
-        public static AcsMessageInteractiveButtonReplyContent AcsMessageInteractiveButtonReplyContent(string buttonId = null, string title = null)
-        {
-            return new AcsMessageInteractiveButtonReplyContent(buttonId, title, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AcsMessageInteractiveListReplyContent"/>. </summary>
-        /// <param name="listItemId"> The ID of the selected list item. </param>
-        /// <param name="title"> The title of the selected list item. </param>
-        /// <param name="description"> The description of the selected row. </param>
-        /// <returns> A new <see cref="SystemEvents.AcsMessageInteractiveListReplyContent"/> instance for mocking. </returns>
-        public static AcsMessageInteractiveListReplyContent AcsMessageInteractiveListReplyContent(string listItemId = null, string title = null, string description = null)
-        {
-            return new AcsMessageInteractiveListReplyContent(listItemId, title, description, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryEventData"/> instance for mocking. </returns>
-        public static ContainerRegistryEventData ContainerRegistryEventData(string id = null, DateTimeOffset timestamp = default, string action = null, string location = null, ContainerRegistryEventTarget target = null, ContainerRegistryEventRequest request = null, ContainerRegistryEventActor actor = null, ContainerRegistryEventSource source = null, ContainerRegistryEventConnectedRegistry connectedRegistry = null)
-        {
-            return new ContainerRegistryEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                request,
-                actor,
-                source,
-                connectedRegistry,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryEventTarget"/>. </summary>
-        /// <param name="mediaType"> The MIME type of the referenced object. </param>
-        /// <param name="size"> The number of bytes of the content. Same as Length field. </param>
-        /// <param name="digest"> The digest of the content, as defined by the Registry V2 HTTP API Specification. </param>
-        /// <param name="length"> The number of bytes of the content. Same as Size field. </param>
-        /// <param name="repository"> The repository name. </param>
-        /// <param name="url"> The direct URL to the content. </param>
-        /// <param name="tag"> The tag name. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryEventTarget"/> instance for mocking. </returns>
-        public static ContainerRegistryEventTarget ContainerRegistryEventTarget(string mediaType = null, long? size = null, string digest = null, long? length = null, string repository = null, string url = null, string tag = null)
-        {
-            return new ContainerRegistryEventTarget(
-                mediaType,
-                size,
-                digest,
-                length,
-                repository,
-                url,
-                tag,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryEventRequest"/>. </summary>
-        /// <param name="id"> The ID of the request that initiated the event. </param>
-        /// <param name="addr"> The IP or hostname and possibly port of the client connection that initiated the event. This is the RemoteAddr from the standard http request. </param>
-        /// <param name="host"> The externally accessible hostname of the registry instance, as specified by the http host header on incoming requests. </param>
-        /// <param name="method"> The request method that generated the event. </param>
-        /// <param name="useragent"> The user agent header of the request. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryEventRequest"/> instance for mocking. </returns>
-        public static ContainerRegistryEventRequest ContainerRegistryEventRequest(string id = null, string addr = null, string host = null, string method = null, string useragent = null)
-        {
-            return new ContainerRegistryEventRequest(
-                id,
-                addr,
-                host,
-                method,
-                useragent,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryEventActor"/>. </summary>
-        /// <param name="name"> The subject or username associated with the request context that generated the event. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryEventActor"/> instance for mocking. </returns>
-        public static ContainerRegistryEventActor ContainerRegistryEventActor(string name = null)
-        {
-            return new ContainerRegistryEventActor(name, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryEventSource"/>. </summary>
-        /// <param name="addr"> The IP or hostname and the port of the registry node that generated the event. Generally, this will be resolved by os.Hostname() along with the running port. </param>
-        /// <param name="instanceID"> The running instance of an application. Changes after each restart. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryEventSource"/> instance for mocking. </returns>
-        public static ContainerRegistryEventSource ContainerRegistryEventSource(string addr = null, string instanceID = null)
-        {
-            return new ContainerRegistryEventSource(addr, instanceID, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryEventConnectedRegistry"/>. </summary>
-        /// <param name="name"> The name of the connected registry that generated this event. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryEventConnectedRegistry"/> instance for mocking. </returns>
-        public static ContainerRegistryEventConnectedRegistry ContainerRegistryEventConnectedRegistry(string name = null)
-        {
-            return new ContainerRegistryEventConnectedRegistry(name, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryImagePushedEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryImagePushedEventData"/> instance for mocking. </returns>
-        public static ContainerRegistryImagePushedEventData ContainerRegistryImagePushedEventData(string id = null, DateTimeOffset timestamp = default, string action = null, string location = null, ContainerRegistryEventTarget target = null, ContainerRegistryEventRequest request = null, ContainerRegistryEventActor actor = null, ContainerRegistryEventSource source = null, ContainerRegistryEventConnectedRegistry connectedRegistry = null)
-        {
-            return new ContainerRegistryImagePushedEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                request,
-                actor,
-                source,
-                connectedRegistry,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryImageDeletedEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="request"> The request that generated the event. </param>
-        /// <param name="actor"> The agent that initiated the event. For most situations, this could be from the authorization context of the request. </param>
-        /// <param name="source"> The registry node that generated the event. Put differently, while the actor initiates the event, the source generates it. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryImageDeletedEventData"/> instance for mocking. </returns>
-        public static ContainerRegistryImageDeletedEventData ContainerRegistryImageDeletedEventData(string id = null, DateTimeOffset timestamp = default, string action = null, string location = null, ContainerRegistryEventTarget target = null, ContainerRegistryEventRequest request = null, ContainerRegistryEventActor actor = null, ContainerRegistryEventSource source = null, ContainerRegistryEventConnectedRegistry connectedRegistry = null)
-        {
-            return new ContainerRegistryImageDeletedEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                request,
-                actor,
-                source,
-                connectedRegistry,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryArtifactEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryArtifactEventData"/> instance for mocking. </returns>
-        public static ContainerRegistryArtifactEventData ContainerRegistryArtifactEventData(string id = null, DateTimeOffset timestamp = default, string action = null, string location = null, ContainerRegistryArtifactEventTarget target = null, ContainerRegistryEventConnectedRegistry connectedRegistry = null)
-        {
-            return new ContainerRegistryArtifactEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                connectedRegistry,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryArtifactEventTarget"/>. </summary>
-        /// <param name="mediaType"> The MIME type of the artifact. </param>
-        /// <param name="size"> The size in bytes of the artifact. </param>
-        /// <param name="digest"> The digest of the artifact. </param>
-        /// <param name="repository"> The repository name of the artifact. </param>
-        /// <param name="tag"> The tag of the artifact. </param>
-        /// <param name="name"> The name of the artifact. </param>
-        /// <param name="version"> The version of the artifact. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryArtifactEventTarget"/> instance for mocking. </returns>
-        public static ContainerRegistryArtifactEventTarget ContainerRegistryArtifactEventTarget(string mediaType = null, long? size = null, string digest = null, string repository = null, string tag = null, string name = null, string version = null)
-        {
-            return new ContainerRegistryArtifactEventTarget(
-                mediaType,
-                size,
-                digest,
-                repository,
-                tag,
-                name,
-                version,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryChartPushedEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryChartPushedEventData"/> instance for mocking. </returns>
-        public static ContainerRegistryChartPushedEventData ContainerRegistryChartPushedEventData(string id = null, DateTimeOffset timestamp = default, string action = null, string location = null, ContainerRegistryArtifactEventTarget target = null, ContainerRegistryEventConnectedRegistry connectedRegistry = null)
-        {
-            return new ContainerRegistryChartPushedEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                connectedRegistry,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerRegistryChartDeletedEventData"/>. </summary>
-        /// <param name="id"> The event ID. </param>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="action"> The action that encompasses the provided event. </param>
-        /// <param name="location"> The location of the event. </param>
-        /// <param name="target"> The target of the event. </param>
-        /// <param name="connectedRegistry"> The connected registry information if the event is generated by a connected registry. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerRegistryChartDeletedEventData"/> instance for mocking. </returns>
-        public static ContainerRegistryChartDeletedEventData ContainerRegistryChartDeletedEventData(string id = null, DateTimeOffset timestamp = default, string action = null, string location = null, ContainerRegistryArtifactEventTarget target = null, ContainerRegistryEventConnectedRegistry connectedRegistry = null)
-        {
-            return new ContainerRegistryChartDeletedEventData(
-                id,
-                timestamp,
-                action,
-                location,
-                target,
-                connectedRegistry,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerServiceNewKubernetesVersionAvailableEventData"/>. </summary>
-        /// <param name="latestSupportedKubernetesVersion"> The highest PATCH Kubernetes version for the highest MINOR version supported by ManagedCluster resource. </param>
-        /// <param name="latestStableKubernetesVersion"> The highest PATCH Kubernetes version for the MINOR version considered stable for the ManagedCluster resource. </param>
-        /// <param name="lowestMinorKubernetesVersion"> The highest PATCH Kubernetes version for the lowest applicable MINOR version available for the ManagedCluster resource. </param>
-        /// <param name="latestPreviewKubernetesVersion"> The highest PATCH Kubernetes version considered preview for the ManagedCluster resource. There might not be any version in preview at the time of publishing the event. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerServiceNewKubernetesVersionAvailableEventData"/> instance for mocking. </returns>
-        public static ContainerServiceNewKubernetesVersionAvailableEventData ContainerServiceNewKubernetesVersionAvailableEventData(string latestSupportedKubernetesVersion = null, string latestStableKubernetesVersion = null, string lowestMinorKubernetesVersion = null, string latestPreviewKubernetesVersion = null)
-        {
-            return new ContainerServiceNewKubernetesVersionAvailableEventData(latestSupportedKubernetesVersion, latestStableKubernetesVersion, lowestMinorKubernetesVersion, latestPreviewKubernetesVersion, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerServiceClusterSupportEventData"/>. </summary>
-        /// <param name="kubernetesVersion"> The Kubernetes version of the ManagedCluster resource. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerServiceClusterSupportEventData"/> instance for mocking. </returns>
-        public static ContainerServiceClusterSupportEventData ContainerServiceClusterSupportEventData(string kubernetesVersion = null)
-        {
-            return new ContainerServiceClusterSupportEventData(kubernetesVersion, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerServiceClusterSupportEndedEventData"/>. </summary>
-        /// <param name="kubernetesVersion"> The Kubernetes version of the ManagedCluster resource. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerServiceClusterSupportEndedEventData"/> instance for mocking. </returns>
-        public static ContainerServiceClusterSupportEndedEventData ContainerServiceClusterSupportEndedEventData(string kubernetesVersion = null)
-        {
-            return new ContainerServiceClusterSupportEndedEventData(kubernetesVersion, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerServiceClusterSupportEndingEventData"/>. </summary>
-        /// <param name="kubernetesVersion"> The Kubernetes version of the ManagedCluster resource. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerServiceClusterSupportEndingEventData"/> instance for mocking. </returns>
-        public static ContainerServiceClusterSupportEndingEventData ContainerServiceClusterSupportEndingEventData(string kubernetesVersion = null)
-        {
-            return new ContainerServiceClusterSupportEndingEventData(kubernetesVersion, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerServiceNodePoolRollingEventData"/>. </summary>
-        /// <param name="nodePoolName"> The name of the node pool in the ManagedCluster resource. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerServiceNodePoolRollingEventData"/> instance for mocking. </returns>
-        public static ContainerServiceNodePoolRollingEventData ContainerServiceNodePoolRollingEventData(string nodePoolName = null)
-        {
-            return new ContainerServiceNodePoolRollingEventData(nodePoolName, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerServiceNodePoolRollingStartedEventData"/>. </summary>
-        /// <param name="nodePoolName"> The name of the node pool in the ManagedCluster resource. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerServiceNodePoolRollingStartedEventData"/> instance for mocking. </returns>
-        public static ContainerServiceNodePoolRollingStartedEventData ContainerServiceNodePoolRollingStartedEventData(string nodePoolName = null)
-        {
-            return new ContainerServiceNodePoolRollingStartedEventData(nodePoolName, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerServiceNodePoolRollingSucceededEventData"/>. </summary>
-        /// <param name="nodePoolName"> The name of the node pool in the ManagedCluster resource. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerServiceNodePoolRollingSucceededEventData"/> instance for mocking. </returns>
-        public static ContainerServiceNodePoolRollingSucceededEventData ContainerServiceNodePoolRollingSucceededEventData(string nodePoolName = null)
-        {
-            return new ContainerServiceNodePoolRollingSucceededEventData(nodePoolName, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ContainerServiceNodePoolRollingFailedEventData"/>. </summary>
-        /// <param name="nodePoolName"> The name of the node pool in the ManagedCluster resource. </param>
-        /// <returns> A new <see cref="SystemEvents.ContainerServiceNodePoolRollingFailedEventData"/> instance for mocking. </returns>
-        public static ContainerServiceNodePoolRollingFailedEventData ContainerServiceNodePoolRollingFailedEventData(string nodePoolName = null)
-        {
-            return new ContainerServiceNodePoolRollingFailedEventData(nodePoolName, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DataBoxCopyStartedEventData"/>. </summary>
-        /// <param name="serialNumber"> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </param>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        /// <returns> A new <see cref="SystemEvents.DataBoxCopyStartedEventData"/> instance for mocking. </returns>
-        public static DataBoxCopyStartedEventData DataBoxCopyStartedEventData(string serialNumber = null, DataBoxStageName stageName = default, DateTimeOffset stageTime = default)
-        {
-            return new DataBoxCopyStartedEventData(serialNumber, stageName, stageTime, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DataBoxCopyCompletedEventData"/>. </summary>
-        /// <param name="serialNumber"> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </param>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        /// <returns> A new <see cref="SystemEvents.DataBoxCopyCompletedEventData"/> instance for mocking. </returns>
-        public static DataBoxCopyCompletedEventData DataBoxCopyCompletedEventData(string serialNumber = null, DataBoxStageName stageName = default, DateTimeOffset stageTime = default)
-        {
-            return new DataBoxCopyCompletedEventData(serialNumber, stageName, stageTime, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DataBoxOrderCompletedEventData"/>. </summary>
-        /// <param name="serialNumber"> Serial Number of the device associated with the event. The list is comma separated if more than one serial number is associated. </param>
-        /// <param name="stageName"> Name of the current Stage. </param>
-        /// <param name="stageTime"> The time at which the stage happened. </param>
-        /// <returns> A new <see cref="SystemEvents.DataBoxOrderCompletedEventData"/> instance for mocking. </returns>
-        public static DataBoxOrderCompletedEventData DataBoxOrderCompletedEventData(string serialNumber = null, DataBoxStageName stageName = default, DateTimeOffset stageTime = default)
-        {
-            return new DataBoxOrderCompletedEventData(serialNumber, stageName, stageTime, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.EventHubCaptureFileCreatedEventData"/>. </summary>
-        /// <param name="fileurl"> The path to the capture file. </param>
-        /// <param name="fileType"> The file type of the capture file. </param>
-        /// <param name="partitionId"> The shard ID. </param>
-        /// <param name="sizeInBytes"> The file size. </param>
-        /// <param name="eventCount"> The number of events in the file. </param>
-        /// <param name="firstSequenceNumber"> The smallest sequence number from the queue. </param>
-        /// <param name="lastSequenceNumber"> The last sequence number from the queue. </param>
-        /// <param name="firstEnqueueTime"> The first time from the queue. </param>
-        /// <param name="lastEnqueueTime"> The last time from the queue. </param>
-        /// <returns> A new <see cref="SystemEvents.EventHubCaptureFileCreatedEventData"/> instance for mocking. </returns>
-        public static EventHubCaptureFileCreatedEventData EventHubCaptureFileCreatedEventData(string fileurl = null, string fileType = null, string partitionId = null, int? sizeInBytes = null, int? eventCount = null, int? firstSequenceNumber = null, int? lastSequenceNumber = null, DateTimeOffset firstEnqueueTime = default, DateTimeOffset lastEnqueueTime = default)
-        {
-            return new EventHubCaptureFileCreatedEventData(
-                fileurl,
-                fileType,
-                partitionId,
-                sizeInBytes,
-                eventCount,
-                firstSequenceNumber,
-                lastSequenceNumber,
-                firstEnqueueTime,
-                lastEnqueueTime,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MapsGeofenceEventProperties"/>. </summary>
-        /// <param name="expiredGeofenceGeometryId"> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </param>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <param name="invalidPeriodGeofenceGeometryId"> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </param>
-        /// <param name="isEventPublished"> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </param>
-        /// <returns> A new <see cref="SystemEvents.MapsGeofenceEventProperties"/> instance for mocking. </returns>
-        public static MapsGeofenceEventProperties MapsGeofenceEventProperties(IEnumerable<string> expiredGeofenceGeometryId = null, IEnumerable<MapsGeofenceGeometry> geometries = null, IEnumerable<string> invalidPeriodGeofenceGeometryId = null, bool? isEventPublished = null)
-        {
-            expiredGeofenceGeometryId ??= new List<string>();
-            geometries ??= new List<MapsGeofenceGeometry>();
-            invalidPeriodGeofenceGeometryId ??= new List<string>();
-
-            return new MapsGeofenceEventProperties(expiredGeofenceGeometryId?.ToList(), geometries?.ToList(), invalidPeriodGeofenceGeometryId?.ToList(), isEventPublished, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MapsGeofenceGeometry"/>. </summary>
-        /// <param name="deviceId"> ID of the device. </param>
-        /// <param name="distance"> Distance from the coordinate to the closest border of the geofence. Positive means the coordinate is outside of the geofence. If the coordinate is outside of the geofence, but more than the value of searchBuffer away from the closest geofence border, then the value is 999. Negative means the coordinate is inside of the geofence. If the coordinate is inside the polygon, but more than the value of searchBuffer away from the closest geofencing border,then the value is -999. A value of 999 means that there is great confidence the coordinate is well outside the geofence. A value of -999 means that there is great confidence the coordinate is well within the geofence. </param>
-        /// <param name="geometryId"> The unique ID for the geofence geometry. </param>
-        /// <param name="nearestLat"> Latitude of the nearest point of the geometry. </param>
-        /// <param name="nearestLon"> Longitude of the nearest point of the geometry. </param>
-        /// <param name="udId"> The unique id returned from user upload service when uploading a geofence. Will not be included in geofencing post API. </param>
-        /// <returns> A new <see cref="SystemEvents.MapsGeofenceGeometry"/> instance for mocking. </returns>
-        public static MapsGeofenceGeometry MapsGeofenceGeometry(string deviceId = null, float? distance = null, string geometryId = null, float? nearestLat = null, float? nearestLon = null, string udId = null)
-        {
-            return new MapsGeofenceGeometry(
-                deviceId,
-                distance,
-                geometryId,
-                nearestLat,
-                nearestLon,
-                udId,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MapsGeofenceEnteredEventData"/>. </summary>
-        /// <param name="expiredGeofenceGeometryId"> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </param>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <param name="invalidPeriodGeofenceGeometryId"> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </param>
-        /// <param name="isEventPublished"> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </param>
-        /// <returns> A new <see cref="SystemEvents.MapsGeofenceEnteredEventData"/> instance for mocking. </returns>
-        public static MapsGeofenceEnteredEventData MapsGeofenceEnteredEventData(IEnumerable<string> expiredGeofenceGeometryId = null, IEnumerable<MapsGeofenceGeometry> geometries = null, IEnumerable<string> invalidPeriodGeofenceGeometryId = null, bool? isEventPublished = null)
-        {
-            expiredGeofenceGeometryId ??= new List<string>();
-            geometries ??= new List<MapsGeofenceGeometry>();
-            invalidPeriodGeofenceGeometryId ??= new List<string>();
-
-            return new MapsGeofenceEnteredEventData(expiredGeofenceGeometryId?.ToList(), geometries?.ToList(), invalidPeriodGeofenceGeometryId?.ToList(), isEventPublished, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MapsGeofenceExitedEventData"/>. </summary>
-        /// <param name="expiredGeofenceGeometryId"> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </param>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <param name="invalidPeriodGeofenceGeometryId"> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </param>
-        /// <param name="isEventPublished"> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </param>
-        /// <returns> A new <see cref="SystemEvents.MapsGeofenceExitedEventData"/> instance for mocking. </returns>
-        public static MapsGeofenceExitedEventData MapsGeofenceExitedEventData(IEnumerable<string> expiredGeofenceGeometryId = null, IEnumerable<MapsGeofenceGeometry> geometries = null, IEnumerable<string> invalidPeriodGeofenceGeometryId = null, bool? isEventPublished = null)
-        {
-            expiredGeofenceGeometryId ??= new List<string>();
-            geometries ??= new List<MapsGeofenceGeometry>();
-            invalidPeriodGeofenceGeometryId ??= new List<string>();
-
-            return new MapsGeofenceExitedEventData(expiredGeofenceGeometryId?.ToList(), geometries?.ToList(), invalidPeriodGeofenceGeometryId?.ToList(), isEventPublished, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MapsGeofenceResultEventData"/>. </summary>
-        /// <param name="expiredGeofenceGeometryId"> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </param>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <param name="invalidPeriodGeofenceGeometryId"> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </param>
-        /// <param name="isEventPublished"> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </param>
-        /// <returns> A new <see cref="SystemEvents.MapsGeofenceResultEventData"/> instance for mocking. </returns>
-        public static MapsGeofenceResultEventData MapsGeofenceResultEventData(IEnumerable<string> expiredGeofenceGeometryId = null, IEnumerable<MapsGeofenceGeometry> geometries = null, IEnumerable<string> invalidPeriodGeofenceGeometryId = null, bool? isEventPublished = null)
-        {
-            expiredGeofenceGeometryId ??= new List<string>();
-            geometries ??= new List<MapsGeofenceGeometry>();
-            invalidPeriodGeofenceGeometryId ??= new List<string>();
-
-            return new MapsGeofenceResultEventData(expiredGeofenceGeometryId?.ToList(), geometries?.ToList(), invalidPeriodGeofenceGeometryId?.ToList(), isEventPublished, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceLifeCycleEventProperties"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceLifeCycleEventProperties"/> instance for mocking. </returns>
-        public static DeviceLifeCycleEventProperties DeviceLifeCycleEventProperties(string deviceId = null, string hubName = null, DeviceTwinInfo twin = null)
-        {
-            return new DeviceLifeCycleEventProperties(deviceId, hubName, twin, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceTwinInfo"/>. </summary>
-        /// <param name="authenticationType"> Authentication type used for this device: either SAS, SelfSigned, or CertificateAuthority. </param>
-        /// <param name="cloudToDeviceMessageCount"> Count of cloud to device messages sent to this device. </param>
-        /// <param name="connectionState"> Whether the device is connected or disconnected. </param>
-        /// <param name="deviceId"> The unique identifier of the device twin. </param>
-        /// <param name="etag"> A piece of information that describes the content of the device twin. Each etag is guaranteed to be unique per device twin. </param>
-        /// <param name="lastActivityTime"> The ISO8601 timestamp of the last activity. </param>
-        /// <param name="properties"> Properties JSON element. </param>
-        /// <param name="status"> Whether the device twin is enabled or disabled. </param>
-        /// <param name="statusUpdateTime"> The ISO8601 timestamp of the last device twin status update. </param>
-        /// <param name="version"> An integer that is incremented by one each time the device twin is updated. </param>
-        /// <param name="x509Thumbprint"> The thumbprint is a unique value for the x509 certificate, commonly used to find a particular certificate in a certificate store. The thumbprint is dynamically generated using the SHA1 algorithm, and does not physically exist in the certificate. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceTwinInfo"/> instance for mocking. </returns>
-        public static DeviceTwinInfo DeviceTwinInfo(string authenticationType = null, float? cloudToDeviceMessageCount = null, string connectionState = null, string deviceId = null, string etag = null, string lastActivityTime = null, DeviceTwinInfoProperties properties = null, string status = null, string statusUpdateTime = null, float? version = null, DeviceTwinInfoX509Thumbprint x509Thumbprint = null)
-        {
-            return new DeviceTwinInfo(
-                authenticationType,
-                cloudToDeviceMessageCount,
-                connectionState,
-                deviceId,
-                etag,
-                lastActivityTime,
-                properties,
-                status,
-                statusUpdateTime,
-                version,
-                x509Thumbprint,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceTwinInfoProperties"/>. </summary>
-        /// <param name="desired"> A portion of the properties that can be written only by the application back-end, and read by the device. </param>
-        /// <param name="reported"> A portion of the properties that can be written only by the device, and read by the application back-end. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceTwinInfoProperties"/> instance for mocking. </returns>
-        public static DeviceTwinInfoProperties DeviceTwinInfoProperties(DeviceTwinProperties desired = null, DeviceTwinProperties reported = null)
-        {
-            return new DeviceTwinInfoProperties(desired, reported, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceTwinProperties"/>. </summary>
-        /// <param name="metadata"> Metadata information for the properties JSON document. </param>
-        /// <param name="version"> Version of device twin properties. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceTwinProperties"/> instance for mocking. </returns>
-        public static DeviceTwinProperties DeviceTwinProperties(DeviceTwinMetadata metadata = null, float? version = null)
-        {
-            return new DeviceTwinProperties(metadata, version, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceTwinMetadata"/>. </summary>
-        /// <param name="lastUpdated"> The ISO8601 timestamp of the last time the properties were updated. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceTwinMetadata"/> instance for mocking. </returns>
-        public static DeviceTwinMetadata DeviceTwinMetadata(string lastUpdated = null)
-        {
-            return new DeviceTwinMetadata(lastUpdated, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceTwinInfoX509Thumbprint"/>. </summary>
-        /// <param name="primaryThumbprint"> Primary thumbprint for the x509 certificate. </param>
-        /// <param name="secondaryThumbprint"> Secondary thumbprint for the x509 certificate. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceTwinInfoX509Thumbprint"/> instance for mocking. </returns>
-        public static DeviceTwinInfoX509Thumbprint DeviceTwinInfoX509Thumbprint(string primaryThumbprint = null, string secondaryThumbprint = null)
-        {
-            return new DeviceTwinInfoX509Thumbprint(primaryThumbprint, secondaryThumbprint, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceConnectionStateEventProperties"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="moduleId"> The unique identifier of the module. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceConnectionStateEventProperties"/> instance for mocking. </returns>
-        public static DeviceConnectionStateEventProperties DeviceConnectionStateEventProperties(string deviceId = null, string moduleId = null, string hubName = null, DeviceConnectionStateEventInfo deviceConnectionStateEventInfo = null)
-        {
-            return new DeviceConnectionStateEventProperties(deviceId, moduleId, hubName, deviceConnectionStateEventInfo, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceConnectionStateEventInfo"/>. </summary>
-        /// <param name="sequenceNumber"> Sequence number is string representation of a hexadecimal number. string compare can be used to identify the larger number because both in ASCII and HEX numbers come after alphabets. If you are converting the string to hex, then the number is a 256 bit number. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceConnectionStateEventInfo"/> instance for mocking. </returns>
-        public static DeviceConnectionStateEventInfo DeviceConnectionStateEventInfo(string sequenceNumber = null)
-        {
-            return new DeviceConnectionStateEventInfo(sequenceNumber, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.DeviceTelemetryEventProperties"/>. </summary>
-        /// <param name="body"> The content of the message from the device. </param>
-        /// <param name="properties"> Application properties are user-defined strings that can be added to the message. These fields are optional. </param>
-        /// <param name="systemProperties"> System properties help identify contents and source of the messages. </param>
-        /// <returns> A new <see cref="SystemEvents.DeviceTelemetryEventProperties"/> instance for mocking. </returns>
-        public static DeviceTelemetryEventProperties DeviceTelemetryEventProperties(IReadOnlyDictionary<string, BinaryData> body = null, IReadOnlyDictionary<string, string> properties = null, IReadOnlyDictionary<string, string> systemProperties = null)
-        {
-            body ??= new Dictionary<string, BinaryData>();
-            properties ??= new Dictionary<string, string>();
-            systemProperties ??= new Dictionary<string, string>();
-
-            return new DeviceTelemetryEventProperties(body, properties, systemProperties, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.IotHubDeviceCreatedEventData"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <returns> A new <see cref="SystemEvents.IotHubDeviceCreatedEventData"/> instance for mocking. </returns>
-        public static IotHubDeviceCreatedEventData IotHubDeviceCreatedEventData(string deviceId = null, string hubName = null, DeviceTwinInfo twin = null)
-        {
-            return new IotHubDeviceCreatedEventData(deviceId, hubName, twin, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.IotHubDeviceDeletedEventData"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <returns> A new <see cref="SystemEvents.IotHubDeviceDeletedEventData"/> instance for mocking. </returns>
-        public static IotHubDeviceDeletedEventData IotHubDeviceDeletedEventData(string deviceId = null, string hubName = null, DeviceTwinInfo twin = null)
-        {
-            return new IotHubDeviceDeletedEventData(deviceId, hubName, twin, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.IotHubDeviceConnectedEventData"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="moduleId"> The unique identifier of the module. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <returns> A new <see cref="SystemEvents.IotHubDeviceConnectedEventData"/> instance for mocking. </returns>
-        public static IotHubDeviceConnectedEventData IotHubDeviceConnectedEventData(string deviceId = null, string moduleId = null, string hubName = null, DeviceConnectionStateEventInfo deviceConnectionStateEventInfo = null)
-        {
-            return new IotHubDeviceConnectedEventData(deviceId, moduleId, hubName, deviceConnectionStateEventInfo, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.IotHubDeviceDisconnectedEventData"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="moduleId"> The unique identifier of the module. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <returns> A new <see cref="SystemEvents.IotHubDeviceDisconnectedEventData"/> instance for mocking. </returns>
-        public static IotHubDeviceDisconnectedEventData IotHubDeviceDisconnectedEventData(string deviceId = null, string moduleId = null, string hubName = null, DeviceConnectionStateEventInfo deviceConnectionStateEventInfo = null)
-        {
-            return new IotHubDeviceDisconnectedEventData(deviceId, moduleId, hubName, deviceConnectionStateEventInfo, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.IotHubDeviceTelemetryEventData"/>. </summary>
-        /// <param name="body"> The content of the message from the device. </param>
-        /// <param name="properties"> Application properties are user-defined strings that can be added to the message. These fields are optional. </param>
-        /// <param name="systemProperties"> System properties help identify contents and source of the messages. </param>
-        /// <returns> A new <see cref="SystemEvents.IotHubDeviceTelemetryEventData"/> instance for mocking. </returns>
-        public static IotHubDeviceTelemetryEventData IotHubDeviceTelemetryEventData(IReadOnlyDictionary<string, BinaryData> body = null, IReadOnlyDictionary<string, string> properties = null, IReadOnlyDictionary<string, string> systemProperties = null)
-        {
-            body ??= new Dictionary<string, BinaryData>();
-            properties ??= new Dictionary<string, string>();
-            systemProperties ??= new Dictionary<string, string>();
-
-            return new IotHubDeviceTelemetryEventData(body, properties, systemProperties, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.HealthcareFhirResourceCreatedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        /// <param name="fhirServiceHostName"> Domain name of FHIR account for this resource. </param>
-        /// <param name="fhirResourceId"> Id of HL7 FHIR resource. </param>
-        /// <param name="fhirResourceVersionId"> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </param>
-        /// <returns> A new <see cref="SystemEvents.HealthcareFhirResourceCreatedEventData"/> instance for mocking. </returns>
-        public static HealthcareFhirResourceCreatedEventData HealthcareFhirResourceCreatedEventData(HealthcareFhirResourceType fhirResourceType = default, string fhirServiceHostName = null, string fhirResourceId = null, long? fhirResourceVersionId = null)
-        {
-            return new HealthcareFhirResourceCreatedEventData(fhirResourceType, fhirServiceHostName, fhirResourceId, fhirResourceVersionId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.HealthcareFhirResourceUpdatedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        /// <param name="fhirServiceHostName"> Domain name of FHIR account for this resource. </param>
-        /// <param name="fhirResourceId"> Id of HL7 FHIR resource. </param>
-        /// <param name="fhirResourceVersionId"> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </param>
-        /// <returns> A new <see cref="SystemEvents.HealthcareFhirResourceUpdatedEventData"/> instance for mocking. </returns>
-        public static HealthcareFhirResourceUpdatedEventData HealthcareFhirResourceUpdatedEventData(HealthcareFhirResourceType fhirResourceType = default, string fhirServiceHostName = null, string fhirResourceId = null, long? fhirResourceVersionId = null)
-        {
-            return new HealthcareFhirResourceUpdatedEventData(fhirResourceType, fhirServiceHostName, fhirResourceId, fhirResourceVersionId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.HealthcareFhirResourceDeletedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        /// <param name="fhirServiceHostName"> Domain name of FHIR account for this resource. </param>
-        /// <param name="fhirResourceId"> Id of HL7 FHIR resource. </param>
-        /// <param name="fhirResourceVersionId"> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </param>
-        /// <returns> A new <see cref="SystemEvents.HealthcareFhirResourceDeletedEventData"/> instance for mocking. </returns>
-        public static HealthcareFhirResourceDeletedEventData HealthcareFhirResourceDeletedEventData(HealthcareFhirResourceType fhirResourceType = default, string fhirServiceHostName = null, string fhirResourceId = null, long? fhirResourceVersionId = null)
-        {
-            return new HealthcareFhirResourceDeletedEventData(fhirResourceType, fhirServiceHostName, fhirResourceId, fhirResourceVersionId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.HealthcareDicomImageCreatedEventData"/>. </summary>
-        /// <param name="partitionName"> Data partition name. </param>
-        /// <param name="imageStudyInstanceUid"> Unique identifier for the Study. </param>
-        /// <param name="imageSeriesInstanceUid"> Unique identifier for the Series. </param>
-        /// <param name="imageSopInstanceUid"> Unique identifier for the DICOM Image. </param>
-        /// <param name="serviceHostName"> Domain name of the DICOM account for this image. </param>
-        /// <param name="sequenceNumber"> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation and deletion within the service. </param>
-        /// <returns> A new <see cref="SystemEvents.HealthcareDicomImageCreatedEventData"/> instance for mocking. </returns>
-        public static HealthcareDicomImageCreatedEventData HealthcareDicomImageCreatedEventData(string partitionName = null, string imageStudyInstanceUid = null, string imageSeriesInstanceUid = null, string imageSopInstanceUid = null, string serviceHostName = null, long? sequenceNumber = null)
-        {
-            return new HealthcareDicomImageCreatedEventData(
-                partitionName,
-                imageStudyInstanceUid,
-                imageSeriesInstanceUid,
-                imageSopInstanceUid,
-                serviceHostName,
-                sequenceNumber,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.HealthcareDicomImageDeletedEventData"/>. </summary>
-        /// <param name="partitionName"> Data partition name. </param>
-        /// <param name="imageStudyInstanceUid"> Unique identifier for the Study. </param>
-        /// <param name="imageSeriesInstanceUid"> Unique identifier for the Series. </param>
-        /// <param name="imageSopInstanceUid"> Unique identifier for the DICOM Image. </param>
-        /// <param name="serviceHostName"> Host name of the DICOM account for this image. </param>
-        /// <param name="sequenceNumber"> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation and deletion within the service. </param>
-        /// <returns> A new <see cref="SystemEvents.HealthcareDicomImageDeletedEventData"/> instance for mocking. </returns>
-        public static HealthcareDicomImageDeletedEventData HealthcareDicomImageDeletedEventData(string partitionName = null, string imageStudyInstanceUid = null, string imageSeriesInstanceUid = null, string imageSopInstanceUid = null, string serviceHostName = null, long? sequenceNumber = null)
-        {
-            return new HealthcareDicomImageDeletedEventData(
-                partitionName,
-                imageStudyInstanceUid,
-                imageSeriesInstanceUid,
-                imageSopInstanceUid,
-                serviceHostName,
-                sequenceNumber,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.HealthcareDicomImageUpdatedEventData"/>. </summary>
-        /// <param name="partitionName"> Data partition name. </param>
-        /// <param name="imageStudyInstanceUid"> Unique identifier for the Study. </param>
-        /// <param name="imageSeriesInstanceUid"> Unique identifier for the Series. </param>
-        /// <param name="imageSopInstanceUid"> Unique identifier for the DICOM Image. </param>
-        /// <param name="serviceHostName"> Domain name of the DICOM account for this image. </param>
-        /// <param name="sequenceNumber"> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation, updation and deletion within the service. </param>
-        /// <returns> A new <see cref="SystemEvents.HealthcareDicomImageUpdatedEventData"/> instance for mocking. </returns>
-        public static HealthcareDicomImageUpdatedEventData HealthcareDicomImageUpdatedEventData(string partitionName = null, string imageStudyInstanceUid = null, string imageSeriesInstanceUid = null, string imageSopInstanceUid = null, string serviceHostName = null, long? sequenceNumber = null)
-        {
-            return new HealthcareDicomImageUpdatedEventData(
-                partitionName,
-                imageStudyInstanceUid,
-                imageSeriesInstanceUid,
-                imageSopInstanceUid,
-                serviceHostName,
-                sequenceNumber,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultCertificateNewVersionCreatedEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultCertificateNewVersionCreatedEventData"/> instance for mocking. </returns>
-        public static KeyVaultCertificateNewVersionCreatedEventData KeyVaultCertificateNewVersionCreatedEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultCertificateNewVersionCreatedEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultCertificateNearExpiryEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultCertificateNearExpiryEventData"/> instance for mocking. </returns>
-        public static KeyVaultCertificateNearExpiryEventData KeyVaultCertificateNearExpiryEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultCertificateNearExpiryEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultCertificateExpiredEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultCertificateExpiredEventData"/> instance for mocking. </returns>
-        public static KeyVaultCertificateExpiredEventData KeyVaultCertificateExpiredEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultCertificateExpiredEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultKeyNewVersionCreatedEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultKeyNewVersionCreatedEventData"/> instance for mocking. </returns>
-        public static KeyVaultKeyNewVersionCreatedEventData KeyVaultKeyNewVersionCreatedEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultKeyNewVersionCreatedEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultKeyNearExpiryEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultKeyNearExpiryEventData"/> instance for mocking. </returns>
-        public static KeyVaultKeyNearExpiryEventData KeyVaultKeyNearExpiryEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultKeyNearExpiryEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultKeyExpiredEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultKeyExpiredEventData"/> instance for mocking. </returns>
-        public static KeyVaultKeyExpiredEventData KeyVaultKeyExpiredEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultKeyExpiredEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultSecretNewVersionCreatedEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultSecretNewVersionCreatedEventData"/> instance for mocking. </returns>
-        public static KeyVaultSecretNewVersionCreatedEventData KeyVaultSecretNewVersionCreatedEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultSecretNewVersionCreatedEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultSecretNearExpiryEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultSecretNearExpiryEventData"/> instance for mocking. </returns>
-        public static KeyVaultSecretNearExpiryEventData KeyVaultSecretNearExpiryEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultSecretNearExpiryEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultSecretExpiredEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultSecretExpiredEventData"/> instance for mocking. </returns>
-        public static KeyVaultSecretExpiredEventData KeyVaultSecretExpiredEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultSecretExpiredEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.KeyVaultAccessPolicyChangedEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <returns> A new <see cref="SystemEvents.KeyVaultAccessPolicyChangedEventData"/> instance for mocking. </returns>
-        public static KeyVaultAccessPolicyChangedEventData KeyVaultAccessPolicyChangedEventData(string id = null, string vaultName = null, string objectType = null, string objectName = null, string version = null, float? nbf = null, float? exp = null)
-        {
-            return new KeyVaultAccessPolicyChangedEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MachineLearningServicesModelRegisteredEventData"/>. </summary>
-        /// <param name="modelName"> The name of the model that was registered. </param>
-        /// <param name="modelVersion"> The version of the model that was registered. </param>
-        /// <param name="modelTags"> The tags of the model that was registered. </param>
-        /// <param name="modelProperties"> The properties of the model that was registered. </param>
-        /// <returns> A new <see cref="SystemEvents.MachineLearningServicesModelRegisteredEventData"/> instance for mocking. </returns>
-        public static MachineLearningServicesModelRegisteredEventData MachineLearningServicesModelRegisteredEventData(string modelName = null, string modelVersion = null, IReadOnlyDictionary<string, BinaryData> modelTags = null, IReadOnlyDictionary<string, BinaryData> modelProperties = null)
-        {
-            modelTags ??= new Dictionary<string, BinaryData>();
-            modelProperties ??= new Dictionary<string, BinaryData>();
-
-            return new MachineLearningServicesModelRegisteredEventData(modelName, modelVersion, modelTags, modelProperties, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MachineLearningServicesModelDeployedEventData"/>. </summary>
-        /// <param name="serviceName"> The name of the deployed service. </param>
-        /// <param name="serviceComputeType"> The compute type (e.g. ACI, AKS) of the deployed service. </param>
-        /// <param name="modelIds"> A common separated list of model IDs. The IDs of the models deployed in the service. </param>
-        /// <param name="serviceTags"> The tags of the deployed service. </param>
-        /// <param name="serviceProperties"> The properties of the deployed service. </param>
-        /// <returns> A new <see cref="SystemEvents.MachineLearningServicesModelDeployedEventData"/> instance for mocking. </returns>
-        public static MachineLearningServicesModelDeployedEventData MachineLearningServicesModelDeployedEventData(string serviceName = null, string serviceComputeType = null, string modelIds = null, IReadOnlyDictionary<string, BinaryData> serviceTags = null, IReadOnlyDictionary<string, BinaryData> serviceProperties = null)
-        {
-            serviceTags ??= new Dictionary<string, BinaryData>();
-            serviceProperties ??= new Dictionary<string, BinaryData>();
-
-            return new MachineLearningServicesModelDeployedEventData(
-                serviceName,
-                serviceComputeType,
-                modelIds,
-                serviceTags,
-                serviceProperties,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MachineLearningServicesRunCompletedEventData"/>. </summary>
-        /// <param name="experimentId"> The ID of the experiment that the run belongs to. </param>
-        /// <param name="experimentName"> The name of the experiment that the run belongs to. </param>
-        /// <param name="runId"> The ID of the Run that was completed. </param>
-        /// <param name="runType"> The Run Type of the completed Run. </param>
-        /// <param name="runTags"> The tags of the completed Run. </param>
-        /// <param name="runProperties"> The properties of the completed Run. </param>
-        /// <returns> A new <see cref="SystemEvents.MachineLearningServicesRunCompletedEventData"/> instance for mocking. </returns>
-        public static MachineLearningServicesRunCompletedEventData MachineLearningServicesRunCompletedEventData(string experimentId = null, string experimentName = null, string runId = null, string runType = null, IReadOnlyDictionary<string, BinaryData> runTags = null, IReadOnlyDictionary<string, BinaryData> runProperties = null)
-        {
-            runTags ??= new Dictionary<string, BinaryData>();
-            runProperties ??= new Dictionary<string, BinaryData>();
-
-            return new MachineLearningServicesRunCompletedEventData(
-                experimentId,
-                experimentName,
-                runId,
-                runType,
-                runTags,
-                runProperties,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MachineLearningServicesDatasetDriftDetectedEventData"/>. </summary>
-        /// <param name="dataDriftId"> The ID of the data drift monitor that triggered the event. </param>
-        /// <param name="dataDriftName"> The name of the data drift monitor that triggered the event. </param>
-        /// <param name="runId"> The ID of the Run that detected data drift. </param>
-        /// <param name="baseDatasetId"> The ID of the base Dataset used to detect drift. </param>
-        /// <param name="targetDatasetId"> The ID of the target Dataset used to detect drift. </param>
-        /// <param name="driftCoefficient"> The coefficient result that triggered the event. </param>
-        /// <param name="startTime"> The start time of the target dataset time series that resulted in drift detection. </param>
-        /// <param name="endTime"> The end time of the target dataset time series that resulted in drift detection. </param>
-        /// <returns> A new <see cref="SystemEvents.MachineLearningServicesDatasetDriftDetectedEventData"/> instance for mocking. </returns>
-        public static MachineLearningServicesDatasetDriftDetectedEventData MachineLearningServicesDatasetDriftDetectedEventData(string dataDriftId = null, string dataDriftName = null, string runId = null, string baseDatasetId = null, string targetDatasetId = null, double? driftCoefficient = null, DateTimeOffset startTime = default, DateTimeOffset endTime = default)
-        {
-            return new MachineLearningServicesDatasetDriftDetectedEventData(
-                dataDriftId,
-                dataDriftName,
-                runId,
-                baseDatasetId,
-                targetDatasetId,
-                driftCoefficient,
-                startTime,
-                endTime,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MachineLearningServicesRunStatusChangedEventData"/>. </summary>
-        /// <param name="experimentId"> The ID of the experiment that the Machine Learning Run belongs to. </param>
-        /// <param name="experimentName"> The name of the experiment that the Machine Learning Run belongs to. </param>
-        /// <param name="runId"> The ID of the Machine Learning Run. </param>
-        /// <param name="runType"> The Run Type of the Machine Learning Run. </param>
-        /// <param name="runTags"> The tags of the Machine Learning Run. </param>
-        /// <param name="runProperties"> The properties of the Machine Learning Run. </param>
-        /// <param name="runStatus"> The status of the Machine Learning Run. </param>
-        /// <returns> A new <see cref="SystemEvents.MachineLearningServicesRunStatusChangedEventData"/> instance for mocking. </returns>
-        public static MachineLearningServicesRunStatusChangedEventData MachineLearningServicesRunStatusChangedEventData(string experimentId = null, string experimentName = null, string runId = null, string runType = null, IReadOnlyDictionary<string, BinaryData> runTags = null, IReadOnlyDictionary<string, BinaryData> runProperties = null, string runStatus = null)
-        {
-            runTags ??= new Dictionary<string, BinaryData>();
-            runProperties ??= new Dictionary<string, BinaryData>();
-
-            return new MachineLearningServicesRunStatusChangedEventData(
-                experimentId,
-                experimentName,
-                runId,
-                runType,
-                runTags,
-                runProperties,
-                runStatus,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobStateChangeEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobStateChangeEventData"/> instance for mocking. </returns>
-        public static MediaJobStateChangeEventData MediaJobStateChangeEventData(MediaJobState previousState = default, MediaJobState state = default, IReadOnlyDictionary<string, string> correlationData = null)
-        {
-            correlationData ??= new Dictionary<string, string>();
-
-            return new MediaJobStateChangeEventData(previousState, state, correlationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobError"/>. </summary>
-        /// <param name="code"> Error code describing the error. </param>
-        /// <param name="message"> A human-readable language-dependent representation of the error. </param>
-        /// <param name="category"> Helps with categorization of errors. </param>
-        /// <param name="retry"> Indicates that it may be possible to retry the Job. If retry is unsuccessful, please contact Azure support via Azure Portal. </param>
-        /// <param name="details"> An array of details about specific errors that led to this reported error. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobError"/> instance for mocking. </returns>
-        public static MediaJobError MediaJobError(MediaJobErrorCode code = default, string message = null, MediaJobErrorCategory category = default, MediaJobRetry retry = default, IEnumerable<MediaJobErrorDetail> details = null)
-        {
-            details ??= new List<MediaJobErrorDetail>();
-
-            return new MediaJobError(
-                code,
-                message,
-                category,
-                retry,
-                details?.ToList(),
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobErrorDetail"/>. </summary>
-        /// <param name="code"> Code describing the error detail. </param>
-        /// <param name="message"> A human-readable representation of the error. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobErrorDetail"/> instance for mocking. </returns>
-        public static MediaJobErrorDetail MediaJobErrorDetail(string code = null, string message = null)
-        {
-            return new MediaJobErrorDetail(code, message, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutput"/>. </summary>
-        /// <param name="odataType"> The discriminator for derived types. </param>
-        /// <param name="error"> Gets the Job output error. </param>
-        /// <param name="label"> Gets the Job output label. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="state"> Gets the Job output state. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutput"/> instance for mocking. </returns>
-        public static MediaJobOutput MediaJobOutput(string odataType = null, MediaJobError error = null, string label = null, long progress = default, MediaJobState state = default)
-        {
-            return new UnknownMediaJobOutput(
-                odataType,
-                error,
-                label,
-                progress,
-                state,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputAsset"/>. </summary>
-        /// <param name="error"> Gets the Job output error. </param>
-        /// <param name="label"> Gets the Job output label. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="state"> Gets the Job output state. </param>
-        /// <param name="assetName"> Gets the Job output asset name. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputAsset"/> instance for mocking. </returns>
-        public static MediaJobOutputAsset MediaJobOutputAsset(MediaJobError error = null, string label = null, long progress = default, MediaJobState state = default, string assetName = null)
-        {
-            return new MediaJobOutputAsset(
-                "#Microsoft.Media.JobOutputAsset",
-                error,
-                label,
-                progress,
-                state,
-                serializedAdditionalRawData: null,
-                assetName);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputProgressEventData"/>. </summary>
-        /// <param name="label"> Gets the Job output label. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputProgressEventData"/> instance for mocking. </returns>
-        public static MediaJobOutputProgressEventData MediaJobOutputProgressEventData(string label = null, long? progress = null, IReadOnlyDictionary<string, string> jobCorrelationData = null)
-        {
-            jobCorrelationData ??= new Dictionary<string, string>();
-
-            return new MediaJobOutputProgressEventData(label, progress, jobCorrelationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputStateChangeEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputStateChangeEventData"/> instance for mocking. </returns>
-        public static MediaJobOutputStateChangeEventData MediaJobOutputStateChangeEventData(MediaJobState previousState = default, MediaJobOutput output = null, IReadOnlyDictionary<string, string> jobCorrelationData = null)
-        {
-            jobCorrelationData ??= new Dictionary<string, string>();
-
-            return new MediaJobOutputStateChangeEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobScheduledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobScheduledEventData"/> instance for mocking. </returns>
-        public static MediaJobScheduledEventData MediaJobScheduledEventData(MediaJobState previousState = default, MediaJobState state = default, IReadOnlyDictionary<string, string> correlationData = null)
-        {
-            correlationData ??= new Dictionary<string, string>();
-
-            return new MediaJobScheduledEventData(previousState, state, correlationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobProcessingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobProcessingEventData"/> instance for mocking. </returns>
-        public static MediaJobProcessingEventData MediaJobProcessingEventData(MediaJobState previousState = default, MediaJobState state = default, IReadOnlyDictionary<string, string> correlationData = null)
-        {
-            correlationData ??= new Dictionary<string, string>();
-
-            return new MediaJobProcessingEventData(previousState, state, correlationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobCancelingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobCancelingEventData"/> instance for mocking. </returns>
-        public static MediaJobCancelingEventData MediaJobCancelingEventData(MediaJobState previousState = default, MediaJobState state = default, IReadOnlyDictionary<string, string> correlationData = null)
-        {
-            correlationData ??= new Dictionary<string, string>();
-
-            return new MediaJobCancelingEventData(previousState, state, correlationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobFinishedEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobFinishedEventData"/> instance for mocking. </returns>
-        public static MediaJobFinishedEventData MediaJobFinishedEventData(MediaJobState previousState = default, MediaJobState state = default, IReadOnlyDictionary<string, string> correlationData = null, IEnumerable<MediaJobOutput> outputs = null)
-        {
-            correlationData ??= new Dictionary<string, string>();
-            outputs ??= new List<MediaJobOutput>();
-
-            return new MediaJobFinishedEventData(previousState, state, correlationData, serializedAdditionalRawData: null, outputs?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobCanceledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobCanceledEventData"/> instance for mocking. </returns>
-        public static MediaJobCanceledEventData MediaJobCanceledEventData(MediaJobState previousState = default, MediaJobState state = default, IReadOnlyDictionary<string, string> correlationData = null, IEnumerable<MediaJobOutput> outputs = null)
-        {
-            correlationData ??= new Dictionary<string, string>();
-            outputs ??= new List<MediaJobOutput>();
-
-            return new MediaJobCanceledEventData(previousState, state, correlationData, serializedAdditionalRawData: null, outputs?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobErroredEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobErroredEventData"/> instance for mocking. </returns>
-        public static MediaJobErroredEventData MediaJobErroredEventData(MediaJobState previousState = default, MediaJobState state = default, IReadOnlyDictionary<string, string> correlationData = null, IEnumerable<MediaJobOutput> outputs = null)
-        {
-            correlationData ??= new Dictionary<string, string>();
-            outputs ??= new List<MediaJobOutput>();
-
-            return new MediaJobErroredEventData(previousState, state, correlationData, serializedAdditionalRawData: null, outputs?.ToList());
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputCanceledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputCanceledEventData"/> instance for mocking. </returns>
-        public static MediaJobOutputCanceledEventData MediaJobOutputCanceledEventData(MediaJobState previousState = default, MediaJobOutput output = null, IReadOnlyDictionary<string, string> jobCorrelationData = null)
-        {
-            jobCorrelationData ??= new Dictionary<string, string>();
-
-            return new MediaJobOutputCanceledEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputCancelingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputCancelingEventData"/> instance for mocking. </returns>
-        public static MediaJobOutputCancelingEventData MediaJobOutputCancelingEventData(MediaJobState previousState = default, MediaJobOutput output = null, IReadOnlyDictionary<string, string> jobCorrelationData = null)
-        {
-            jobCorrelationData ??= new Dictionary<string, string>();
-
-            return new MediaJobOutputCancelingEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputErroredEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputErroredEventData"/> instance for mocking. </returns>
-        public static MediaJobOutputErroredEventData MediaJobOutputErroredEventData(MediaJobState previousState = default, MediaJobOutput output = null, IReadOnlyDictionary<string, string> jobCorrelationData = null)
-        {
-            jobCorrelationData ??= new Dictionary<string, string>();
-
-            return new MediaJobOutputErroredEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputFinishedEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputFinishedEventData"/> instance for mocking. </returns>
-        public static MediaJobOutputFinishedEventData MediaJobOutputFinishedEventData(MediaJobState previousState = default, MediaJobOutput output = null, IReadOnlyDictionary<string, string> jobCorrelationData = null)
-        {
-            jobCorrelationData ??= new Dictionary<string, string>();
-
-            return new MediaJobOutputFinishedEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputProcessingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputProcessingEventData"/> instance for mocking. </returns>
-        public static MediaJobOutputProcessingEventData MediaJobOutputProcessingEventData(MediaJobState previousState = default, MediaJobOutput output = null, IReadOnlyDictionary<string, string> jobCorrelationData = null)
-        {
-            jobCorrelationData ??= new Dictionary<string, string>();
-
-            return new MediaJobOutputProcessingEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaJobOutputScheduledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="SystemEvents.MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="SystemEvents.MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaJobOutputScheduledEventData"/> instance for mocking. </returns>
-        public static MediaJobOutputScheduledEventData MediaJobOutputScheduledEventData(MediaJobState previousState = default, MediaJobOutput output = null, IReadOnlyDictionary<string, string> jobCorrelationData = null)
-        {
-            jobCorrelationData ??= new Dictionary<string, string>();
-
-            return new MediaJobOutputScheduledEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventEncoderConnectedEventData"/>. </summary>
-        /// <param name="ingestUrl"> Gets the ingest URL provided by the live event. </param>
-        /// <param name="streamId"> Gets the stream Id. </param>
-        /// <param name="encoderIp"> Gets the remote IP. </param>
-        /// <param name="encoderPort"> Gets the remote port. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventEncoderConnectedEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventEncoderConnectedEventData MediaLiveEventEncoderConnectedEventData(string ingestUrl = null, string streamId = null, string encoderIp = null, string encoderPort = null)
-        {
-            return new MediaLiveEventEncoderConnectedEventData(ingestUrl, streamId, encoderIp, encoderPort, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventConnectionRejectedEventData"/>. </summary>
-        /// <param name="ingestUrl"> Gets the ingest URL provided by the live event. </param>
-        /// <param name="streamId"> Gets the stream Id. </param>
-        /// <param name="encoderIp"> Gets the remote IP. </param>
-        /// <param name="encoderPort"> Gets the remote port. </param>
-        /// <param name="resultCode"> Gets the result code. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventConnectionRejectedEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventConnectionRejectedEventData MediaLiveEventConnectionRejectedEventData(string ingestUrl = null, string streamId = null, string encoderIp = null, string encoderPort = null, string resultCode = null)
-        {
-            return new MediaLiveEventConnectionRejectedEventData(
-                ingestUrl,
-                streamId,
-                encoderIp,
-                encoderPort,
-                resultCode,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventEncoderDisconnectedEventData"/>. </summary>
-        /// <param name="ingestUrl"> Gets the ingest URL provided by the live event. </param>
-        /// <param name="streamId"> Gets the stream Id. </param>
-        /// <param name="encoderIp"> Gets the remote IP. </param>
-        /// <param name="encoderPort"> Gets the remote port. </param>
-        /// <param name="resultCode"> Gets the result code. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventEncoderDisconnectedEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventEncoderDisconnectedEventData MediaLiveEventEncoderDisconnectedEventData(string ingestUrl = null, string streamId = null, string encoderIp = null, string encoderPort = null, string resultCode = null)
-        {
-            return new MediaLiveEventEncoderDisconnectedEventData(
-                ingestUrl,
-                streamId,
-                encoderIp,
-                encoderPort,
-                resultCode,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventIncomingStreamReceivedEventData"/>. </summary>
-        /// <param name="ingestUrl"> Gets the ingest URL provided by the live event. </param>
-        /// <param name="trackType"> Gets the type of the track (Audio / Video). </param>
-        /// <param name="trackName"> Gets the track name. </param>
-        /// <param name="bitrate"> Gets the bitrate of the track. </param>
-        /// <param name="encoderIp"> Gets the remote IP. </param>
-        /// <param name="encoderPort"> Gets the remote port. </param>
-        /// <param name="timestamp"> Gets the first timestamp of the data chunk received. </param>
-        /// <param name="duration"> Gets the duration of the first data chunk. </param>
-        /// <param name="timescale"> Gets the timescale in which timestamp is represented. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventIncomingStreamReceivedEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventIncomingStreamReceivedEventData MediaLiveEventIncomingStreamReceivedEventData(string ingestUrl = null, string trackType = null, string trackName = null, long? bitrate = null, string encoderIp = null, string encoderPort = null, string timestamp = null, string duration = null, string timescale = null)
-        {
-            return new MediaLiveEventIncomingStreamReceivedEventData(
-                ingestUrl,
-                trackType,
-                trackName,
-                bitrate,
-                encoderIp,
-                encoderPort,
-                timestamp,
-                duration,
-                timescale,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventIncomingStreamsOutOfSyncEventData"/>. </summary>
-        /// <param name="minLastTimestamp"> Gets the minimum last timestamp received. </param>
-        /// <param name="typeOfStreamWithMinLastTimestamp"> Gets the type of stream with minimum last timestamp. </param>
-        /// <param name="maxLastTimestamp"> Gets the maximum timestamp among all the tracks (audio or video). </param>
-        /// <param name="typeOfStreamWithMaxLastTimestamp"> Gets the type of stream with maximum last timestamp. </param>
-        /// <param name="timescaleOfMinLastTimestamp"> Gets the timescale in which \"MinLastTimestamp\" is represented. </param>
-        /// <param name="timescaleOfMaxLastTimestamp"> Gets the timescale in which \"MaxLastTimestamp\" is represented. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventIncomingStreamsOutOfSyncEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventIncomingStreamsOutOfSyncEventData MediaLiveEventIncomingStreamsOutOfSyncEventData(string minLastTimestamp = null, string typeOfStreamWithMinLastTimestamp = null, string maxLastTimestamp = null, string typeOfStreamWithMaxLastTimestamp = null, string timescaleOfMinLastTimestamp = null, string timescaleOfMaxLastTimestamp = null)
-        {
-            return new MediaLiveEventIncomingStreamsOutOfSyncEventData(
-                minLastTimestamp,
-                typeOfStreamWithMinLastTimestamp,
-                maxLastTimestamp,
-                typeOfStreamWithMaxLastTimestamp,
-                timescaleOfMinLastTimestamp,
-                timescaleOfMaxLastTimestamp,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventIncomingVideoStreamsOutOfSyncEventData"/>. </summary>
-        /// <param name="firstTimestamp"> Gets the first timestamp received for one of the quality levels. </param>
-        /// <param name="firstDuration"> Gets the duration of the data chunk with first timestamp. </param>
-        /// <param name="secondTimestamp"> Gets the timestamp received for some other quality levels. </param>
-        /// <param name="secondDuration"> Gets the duration of the data chunk with second timestamp. </param>
-        /// <param name="timescale"> Gets the timescale in which both the timestamps and durations are represented. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventIncomingVideoStreamsOutOfSyncEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventIncomingVideoStreamsOutOfSyncEventData MediaLiveEventIncomingVideoStreamsOutOfSyncEventData(string firstTimestamp = null, string firstDuration = null, string secondTimestamp = null, string secondDuration = null, string timescale = null)
-        {
-            return new MediaLiveEventIncomingVideoStreamsOutOfSyncEventData(
-                firstTimestamp,
-                firstDuration,
-                secondTimestamp,
-                secondDuration,
-                timescale,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventIncomingDataChunkDroppedEventData"/>. </summary>
-        /// <param name="timestamp"> Gets the timestamp of the data chunk dropped. </param>
-        /// <param name="trackType"> Gets the type of the track (Audio / Video). </param>
-        /// <param name="bitrate"> Gets the bitrate of the track. </param>
-        /// <param name="resultCode"> Gets the result code for fragment drop operation. </param>
-        /// <param name="trackName"> Gets the name of the track for which fragment is dropped. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventIncomingDataChunkDroppedEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventIncomingDataChunkDroppedEventData MediaLiveEventIncomingDataChunkDroppedEventData(string timestamp = null, string trackType = null, long? bitrate = null, string resultCode = null, string trackName = null)
-        {
-            return new MediaLiveEventIncomingDataChunkDroppedEventData(
-                timestamp,
-                trackType,
-                bitrate,
-                resultCode,
-                trackName,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventIngestHeartbeatEventData"/>. </summary>
-        /// <param name="trackType"> Gets the type of the track (Audio / Video). </param>
-        /// <param name="trackName"> Gets the track name. </param>
-        /// <param name="transcriptionLanguage"> Gets the Live Transcription language. </param>
-        /// <param name="transcriptionState"> Gets the Live Transcription state. </param>
-        /// <param name="bitrate"> Gets the bitrate of the track. </param>
-        /// <param name="incomingBitrate"> Gets the incoming bitrate. </param>
-        /// <param name="ingestDriftValue"> Gets the track ingest drift value. </param>
-        /// <param name="lastFragmentArrivalTime"> Gets the arrival UTC time of the last fragment. </param>
-        /// <param name="lastTimestamp"> Gets the last timestamp. </param>
-        /// <param name="timescale"> Gets the timescale of the last timestamp. </param>
-        /// <param name="overlapCount"> Gets the fragment Overlap count. </param>
-        /// <param name="discontinuityCount"> Gets the fragment Discontinuity count. </param>
-        /// <param name="nonincreasingCount"> Gets Non increasing count. </param>
-        /// <param name="unexpectedBitrate"> Gets a value indicating whether unexpected bitrate is present or not. </param>
-        /// <param name="state"> Gets the state of the live event. </param>
-        /// <param name="healthy"> Gets a value indicating whether preview is healthy or not. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventIngestHeartbeatEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventIngestHeartbeatEventData MediaLiveEventIngestHeartbeatEventData(string trackType = null, string trackName = null, string transcriptionLanguage = null, string transcriptionState = null, long? bitrate = null, long? incomingBitrate = null, string ingestDriftValue = null, string lastFragmentArrivalTime = null, string lastTimestamp = null, string timescale = null, long? overlapCount = null, long? discontinuityCount = null, long? nonincreasingCount = null, bool? unexpectedBitrate = null, string state = null, bool? healthy = null)
-        {
-            return new MediaLiveEventIngestHeartbeatEventData(
-                trackType,
-                trackName,
-                transcriptionLanguage,
-                transcriptionState,
-                bitrate,
-                incomingBitrate,
-                ingestDriftValue,
-                lastFragmentArrivalTime,
-                lastTimestamp,
-                timescale,
-                overlapCount,
-                discontinuityCount,
-                nonincreasingCount,
-                unexpectedBitrate,
-                state,
-                healthy,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventTrackDiscontinuityDetectedEventData"/>. </summary>
-        /// <param name="trackType"> Gets the type of the track (Audio / Video). </param>
-        /// <param name="trackName"> Gets the track name. </param>
-        /// <param name="bitrate"> Gets the bitrate. </param>
-        /// <param name="previousTimestamp"> Gets the timestamp of the previous fragment. </param>
-        /// <param name="newTimestamp"> Gets the timestamp of the current fragment. </param>
-        /// <param name="timescale"> Gets the timescale in which both timestamps and discontinuity gap are represented. </param>
-        /// <param name="discontinuityGap"> Gets the discontinuity gap between PreviousTimestamp and NewTimestamp. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventTrackDiscontinuityDetectedEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventTrackDiscontinuityDetectedEventData MediaLiveEventTrackDiscontinuityDetectedEventData(string trackType = null, string trackName = null, long? bitrate = null, string previousTimestamp = null, string newTimestamp = null, string timescale = null, string discontinuityGap = null)
-        {
-            return new MediaLiveEventTrackDiscontinuityDetectedEventData(
-                trackType,
-                trackName,
-                bitrate,
-                previousTimestamp,
-                newTimestamp,
-                timescale,
-                discontinuityGap,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.MediaLiveEventChannelArchiveHeartbeatEventData"/>. </summary>
-        /// <param name="channelLatencyMs"> Gets the channel latency in ms. </param>
-        /// <param name="latencyResultCode"> Gets the latency result code. </param>
-        /// <returns> A new <see cref="SystemEvents.MediaLiveEventChannelArchiveHeartbeatEventData"/> instance for mocking. </returns>
-        public static MediaLiveEventChannelArchiveHeartbeatEventData MediaLiveEventChannelArchiveHeartbeatEventData(string channelLatencyMs = null, string latencyResultCode = null)
-        {
-            return new MediaLiveEventChannelArchiveHeartbeatEventData(channelLatencyMs, latencyResultCode, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.PolicyInsightsPolicyStateCreatedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        /// <param name="policyAssignmentId"> The resource ID of the policy assignment. </param>
-        /// <param name="policyDefinitionId"> The resource ID of the policy definition. </param>
-        /// <param name="policyDefinitionReferenceId"> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </param>
-        /// <param name="complianceState"> The compliance state of the resource with respect to the policy assignment. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="complianceReasonCode"> The compliance reason code. May be empty. </param>
-        /// <returns> A new <see cref="SystemEvents.PolicyInsightsPolicyStateCreatedEventData"/> instance for mocking. </returns>
-        public static PolicyInsightsPolicyStateCreatedEventData PolicyInsightsPolicyStateCreatedEventData(DateTimeOffset timestamp = default, string policyAssignmentId = null, string policyDefinitionId = null, string policyDefinitionReferenceId = null, string complianceState = null, string subscriptionId = null, string complianceReasonCode = null)
-        {
-            return new PolicyInsightsPolicyStateCreatedEventData(
-                timestamp,
-                policyAssignmentId,
-                policyDefinitionId,
-                policyDefinitionReferenceId,
-                complianceState,
-                subscriptionId,
-                complianceReasonCode,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.PolicyInsightsPolicyStateChangedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        /// <param name="policyAssignmentId"> The resource ID of the policy assignment. </param>
-        /// <param name="policyDefinitionId"> The resource ID of the policy definition. </param>
-        /// <param name="policyDefinitionReferenceId"> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </param>
-        /// <param name="complianceState"> The compliance state of the resource with respect to the policy assignment. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="complianceReasonCode"> The compliance reason code. May be empty. </param>
-        /// <returns> A new <see cref="SystemEvents.PolicyInsightsPolicyStateChangedEventData"/> instance for mocking. </returns>
-        public static PolicyInsightsPolicyStateChangedEventData PolicyInsightsPolicyStateChangedEventData(DateTimeOffset timestamp = default, string policyAssignmentId = null, string policyDefinitionId = null, string policyDefinitionReferenceId = null, string complianceState = null, string subscriptionId = null, string complianceReasonCode = null)
-        {
-            return new PolicyInsightsPolicyStateChangedEventData(
-                timestamp,
-                policyAssignmentId,
-                policyDefinitionId,
-                policyDefinitionReferenceId,
-                complianceState,
-                subscriptionId,
-                complianceReasonCode,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.PolicyInsightsPolicyStateDeletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        /// <param name="policyAssignmentId"> The resource ID of the policy assignment. </param>
-        /// <param name="policyDefinitionId"> The resource ID of the policy definition. </param>
-        /// <param name="policyDefinitionReferenceId"> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </param>
-        /// <param name="complianceState"> The compliance state of the resource with respect to the policy assignment. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="complianceReasonCode"> The compliance reason code. May be empty. </param>
-        /// <returns> A new <see cref="SystemEvents.PolicyInsightsPolicyStateDeletedEventData"/> instance for mocking. </returns>
-        public static PolicyInsightsPolicyStateDeletedEventData PolicyInsightsPolicyStateDeletedEventData(DateTimeOffset timestamp = default, string policyAssignmentId = null, string policyDefinitionId = null, string policyDefinitionReferenceId = null, string complianceState = null, string subscriptionId = null, string complianceReasonCode = null)
-        {
-            return new PolicyInsightsPolicyStateDeletedEventData(
-                timestamp,
-                policyAssignmentId,
-                policyDefinitionId,
-                policyDefinitionReferenceId,
-                complianceState,
-                subscriptionId,
-                complianceReasonCode,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.RedisPatchingCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="name"> The name of this event. </param>
-        /// <param name="status"> The status of this event. Failed or  succeeded. </param>
-        /// <returns> A new <see cref="SystemEvents.RedisPatchingCompletedEventData"/> instance for mocking. </returns>
-        public static RedisPatchingCompletedEventData RedisPatchingCompletedEventData(DateTimeOffset timestamp = default, string name = null, string status = null)
-        {
-            return new RedisPatchingCompletedEventData(timestamp, name, status, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.RedisScalingCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="name"> The name of this event. </param>
-        /// <param name="status"> The status of this event. Failed or  succeeded. </param>
-        /// <returns> A new <see cref="SystemEvents.RedisScalingCompletedEventData"/> instance for mocking. </returns>
-        public static RedisScalingCompletedEventData RedisScalingCompletedEventData(DateTimeOffset timestamp = default, string name = null, string status = null)
-        {
-            return new RedisScalingCompletedEventData(timestamp, name, status, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.RedisExportRDBCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="name"> The name of this event. </param>
-        /// <param name="status"> The status of this event. Failed or  succeeded. </param>
-        /// <returns> A new <see cref="SystemEvents.RedisExportRDBCompletedEventData"/> instance for mocking. </returns>
-        public static RedisExportRDBCompletedEventData RedisExportRDBCompletedEventData(DateTimeOffset timestamp = default, string name = null, string status = null)
-        {
-            return new RedisExportRDBCompletedEventData(timestamp, name, status, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.RedisImportRDBCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="name"> The name of this event. </param>
-        /// <param name="status"> The status of this event. Failed or  succeeded. </param>
-        /// <returns> A new <see cref="SystemEvents.RedisImportRDBCompletedEventData"/> instance for mocking. </returns>
-        public static RedisImportRDBCompletedEventData RedisImportRDBCompletedEventData(DateTimeOffset timestamp = default, string name = null, string status = null)
-        {
-            return new RedisImportRDBCompletedEventData(timestamp, name, status, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceWriteSuccessEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceWriteSuccessEventData"/> instance for mocking. </returns>
-        public static ResourceWriteSuccessEventData ResourceWriteSuccessEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceWriteSuccessEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceAuthorization"/>. </summary>
-        /// <param name="scope"> The scope of the authorization. </param>
-        /// <param name="action"> The action being requested. </param>
-        /// <param name="evidence"> The evidence for the authorization. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceAuthorization"/> instance for mocking. </returns>
-        public static ResourceAuthorization ResourceAuthorization(string scope = null, string action = null, IReadOnlyDictionary<string, string> evidence = null)
-        {
-            evidence ??= new Dictionary<string, string>();
-
-            return new ResourceAuthorization(scope, action, evidence, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceHttpRequest"/>. </summary>
-        /// <param name="clientRequestId"> The client request ID. </param>
-        /// <param name="clientIpAddress"> The client IP address. </param>
-        /// <param name="method"> The request method. </param>
-        /// <param name="url"> The url used in the request. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceHttpRequest"/> instance for mocking. </returns>
-        public static ResourceHttpRequest ResourceHttpRequest(string clientRequestId = null, string clientIpAddress = null, string method = null, string url = null)
-        {
-            return new ResourceHttpRequest(clientRequestId, clientIpAddress, method, url, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceWriteFailureEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceWriteFailureEventData"/> instance for mocking. </returns>
-        public static ResourceWriteFailureEventData ResourceWriteFailureEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceWriteFailureEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceWriteCancelEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceWriteCancelEventData"/> instance for mocking. </returns>
-        public static ResourceWriteCancelEventData ResourceWriteCancelEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceWriteCancelEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceDeleteSuccessEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceDeleteSuccessEventData"/> instance for mocking. </returns>
-        public static ResourceDeleteSuccessEventData ResourceDeleteSuccessEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceDeleteSuccessEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceDeleteFailureEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceDeleteFailureEventData"/> instance for mocking. </returns>
-        public static ResourceDeleteFailureEventData ResourceDeleteFailureEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceDeleteFailureEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceDeleteCancelEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceDeleteCancelEventData"/> instance for mocking. </returns>
-        public static ResourceDeleteCancelEventData ResourceDeleteCancelEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceDeleteCancelEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceActionSuccessEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceActionSuccessEventData"/> instance for mocking. </returns>
-        public static ResourceActionSuccessEventData ResourceActionSuccessEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceActionSuccessEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceActionFailureEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceActionFailureEventData"/> instance for mocking. </returns>
-        public static ResourceActionFailureEventData ResourceActionFailureEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceActionFailureEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceActionCancelEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceActionCancelEventData"/> instance for mocking. </returns>
-        public static ResourceActionCancelEventData ResourceActionCancelEventData(string tenantId = null, string subscriptionId = null, string resourceGroup = null, string resourceProvider = null, string resourceUri = null, string operationName = null, string status = null, ResourceAuthorization authorization = null, IReadOnlyDictionary<string, string> claims = null, string correlationId = null, ResourceHttpRequest httpRequest = null)
-        {
-            claims ??= new Dictionary<string, string>();
-
-            return new ResourceActionCancelEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ServiceBusActiveMessagesAvailableWithNoListenersEventData"/>. </summary>
-        /// <param name="namespaceName"> The namespace name of the Microsoft.ServiceBus resource. </param>
-        /// <param name="requestUri"> The endpoint of the Microsoft.ServiceBus resource. </param>
-        /// <param name="entityType"> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </param>
-        /// <param name="queueName"> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </param>
-        /// <param name="topicName"> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="subscriptionName"> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <returns> A new <see cref="SystemEvents.ServiceBusActiveMessagesAvailableWithNoListenersEventData"/> instance for mocking. </returns>
-        public static ServiceBusActiveMessagesAvailableWithNoListenersEventData ServiceBusActiveMessagesAvailableWithNoListenersEventData(string namespaceName = null, string requestUri = null, string entityType = null, string queueName = null, string topicName = null, string subscriptionName = null)
-        {
-            return new ServiceBusActiveMessagesAvailableWithNoListenersEventData(
-                namespaceName,
-                requestUri,
-                entityType,
-                queueName,
-                topicName,
-                subscriptionName,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ServiceBusDeadletterMessagesAvailableWithNoListenersEventData"/>. </summary>
-        /// <param name="namespaceName"> The namespace name of the Microsoft.ServiceBus resource. </param>
-        /// <param name="requestUri"> The endpoint of the Microsoft.ServiceBus resource. </param>
-        /// <param name="entityType"> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </param>
-        /// <param name="queueName"> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </param>
-        /// <param name="topicName"> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="subscriptionName"> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <returns> A new <see cref="SystemEvents.ServiceBusDeadletterMessagesAvailableWithNoListenersEventData"/> instance for mocking. </returns>
-        public static ServiceBusDeadletterMessagesAvailableWithNoListenersEventData ServiceBusDeadletterMessagesAvailableWithNoListenersEventData(string namespaceName = null, string requestUri = null, string entityType = null, string queueName = null, string topicName = null, string subscriptionName = null)
-        {
-            return new ServiceBusDeadletterMessagesAvailableWithNoListenersEventData(
-                namespaceName,
-                requestUri,
-                entityType,
-                queueName,
-                topicName,
-                subscriptionName,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData"/>. </summary>
-        /// <param name="namespaceName"> The namespace name of the Microsoft.ServiceBus resource. </param>
-        /// <param name="requestUri"> The endpoint of the Microsoft.ServiceBus resource. </param>
-        /// <param name="entityType"> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </param>
-        /// <param name="queueName"> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </param>
-        /// <param name="topicName"> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="subscriptionName"> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <returns> A new <see cref="SystemEvents.ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData"/> instance for mocking. </returns>
-        public static ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData(string namespaceName = null, string requestUri = null, string entityType = null, string queueName = null, string topicName = null, string subscriptionName = null)
-        {
-            return new ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData(
-                namespaceName,
-                requestUri,
-                entityType,
-                queueName,
-                topicName,
-                subscriptionName,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData"/>. </summary>
-        /// <param name="namespaceName"> The namespace name of the Microsoft.ServiceBus resource. </param>
-        /// <param name="requestUri"> The endpoint of the Microsoft.ServiceBus resource. </param>
-        /// <param name="entityType"> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </param>
-        /// <param name="queueName"> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </param>
-        /// <param name="topicName"> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="subscriptionName"> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <returns> A new <see cref="SystemEvents.ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData"/> instance for mocking. </returns>
-        public static ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData(string namespaceName = null, string requestUri = null, string entityType = null, string queueName = null, string topicName = null, string subscriptionName = null)
-        {
-            return new ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData(
-                namespaceName,
-                requestUri,
-                entityType,
-                queueName,
-                topicName,
-                subscriptionName,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.SignalRServiceClientConnectionConnectedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="hubName"> The hub of connected client connection. </param>
-        /// <param name="connectionId"> The connection Id of connected client connection. </param>
-        /// <param name="userId"> The user Id of connected client connection. </param>
-        /// <returns> A new <see cref="SystemEvents.SignalRServiceClientConnectionConnectedEventData"/> instance for mocking. </returns>
-        public static SignalRServiceClientConnectionConnectedEventData SignalRServiceClientConnectionConnectedEventData(DateTimeOffset timestamp = default, string hubName = null, string connectionId = null, string userId = null)
-        {
-            return new SignalRServiceClientConnectionConnectedEventData(timestamp, hubName, connectionId, userId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.SignalRServiceClientConnectionDisconnectedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="hubName"> The hub of connected client connection. </param>
-        /// <param name="connectionId"> The connection Id of connected client connection. </param>
-        /// <param name="userId"> The user Id of connected client connection. </param>
-        /// <param name="errorMessage"> The message of error that cause the client connection disconnected. </param>
-        /// <returns> A new <see cref="SystemEvents.SignalRServiceClientConnectionDisconnectedEventData"/> instance for mocking. </returns>
-        public static SignalRServiceClientConnectionDisconnectedEventData SignalRServiceClientConnectionDisconnectedEventData(DateTimeOffset timestamp = default, string hubName = null, string connectionId = null, string userId = null, string errorMessage = null)
-        {
-            return new SignalRServiceClientConnectionDisconnectedEventData(
-                timestamp,
-                hubName,
-                connectionId,
-                userId,
-                errorMessage,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageBlobCreatedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="eTag"> The etag of the blob at the time this event was triggered. </param>
-        /// <param name="contentType"> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </param>
-        /// <param name="contentLength"> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </param>
-        /// <param name="contentOffset"> The offset of the blob in bytes. </param>
-        /// <param name="blobType"> The type of blob. </param>
-        /// <param name="url"> The path to the blob. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageBlobCreatedEventData"/> instance for mocking. </returns>
-        public static StorageBlobCreatedEventData StorageBlobCreatedEventData(string api = null, string clientRequestId = null, string requestId = null, string eTag = null, string contentType = null, long? contentLength = null, long? contentOffset = null, string blobType = null, string url = null, string sequencer = null, string identity = null, IReadOnlyDictionary<string, BinaryData> storageDiagnostics = null)
-        {
-            storageDiagnostics ??= new Dictionary<string, BinaryData>();
-
-            return new StorageBlobCreatedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                eTag,
-                contentType,
-                contentLength,
-                contentOffset,
-                blobType,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageBlobDeletedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="contentType"> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </param>
-        /// <param name="blobType"> The type of blob. </param>
-        /// <param name="url"> The path to the blob. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageBlobDeletedEventData"/> instance for mocking. </returns>
-        public static StorageBlobDeletedEventData StorageBlobDeletedEventData(string api = null, string clientRequestId = null, string requestId = null, string contentType = null, string blobType = null, string url = null, string sequencer = null, string identity = null, IReadOnlyDictionary<string, BinaryData> storageDiagnostics = null)
-        {
-            storageDiagnostics ??= new Dictionary<string, BinaryData>();
-
-            return new StorageBlobDeletedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                contentType,
-                blobType,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageDirectoryCreatedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="eTag"> The etag of the directory at the time this event was triggered. </param>
-        /// <param name="url"> The path to the directory. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageDirectoryCreatedEventData"/> instance for mocking. </returns>
-        public static StorageDirectoryCreatedEventData StorageDirectoryCreatedEventData(string api = null, string clientRequestId = null, string requestId = null, string eTag = null, string url = null, string sequencer = null, string identity = null, IReadOnlyDictionary<string, BinaryData> storageDiagnostics = null)
-        {
-            storageDiagnostics ??= new Dictionary<string, BinaryData>();
-
-            return new StorageDirectoryCreatedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                eTag,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageDirectoryDeletedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="url"> The path to the deleted directory. </param>
-        /// <param name="recursive"> Is this event for a recursive delete operation. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageDirectoryDeletedEventData"/> instance for mocking. </returns>
-        public static StorageDirectoryDeletedEventData StorageDirectoryDeletedEventData(string api = null, string clientRequestId = null, string requestId = null, string url = null, string recursive = null, string sequencer = null, string identity = null, IReadOnlyDictionary<string, BinaryData> storageDiagnostics = null)
-        {
-            storageDiagnostics ??= new Dictionary<string, BinaryData>();
-
-            return new StorageDirectoryDeletedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                url,
-                recursive,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageBlobRenamedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="sourceUrl"> The path to the blob that was renamed. </param>
-        /// <param name="destinationUrl"> The new path to the blob after the rename operation. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageBlobRenamedEventData"/> instance for mocking. </returns>
-        public static StorageBlobRenamedEventData StorageBlobRenamedEventData(string api = null, string clientRequestId = null, string requestId = null, string sourceUrl = null, string destinationUrl = null, string sequencer = null, string identity = null, IReadOnlyDictionary<string, BinaryData> storageDiagnostics = null)
-        {
-            storageDiagnostics ??= new Dictionary<string, BinaryData>();
-
-            return new StorageBlobRenamedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                sourceUrl,
-                destinationUrl,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageDirectoryRenamedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="sourceUrl"> The path to the directory that was renamed. </param>
-        /// <param name="destinationUrl"> The new path to the directory after the rename operation. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageDirectoryRenamedEventData"/> instance for mocking. </returns>
-        public static StorageDirectoryRenamedEventData StorageDirectoryRenamedEventData(string api = null, string clientRequestId = null, string requestId = null, string sourceUrl = null, string destinationUrl = null, string sequencer = null, string identity = null, IReadOnlyDictionary<string, BinaryData> storageDiagnostics = null)
-        {
-            storageDiagnostics ??= new Dictionary<string, BinaryData>();
-
-            return new StorageDirectoryRenamedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                sourceUrl,
-                destinationUrl,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageLifecyclePolicyCompletedEventData"/>. </summary>
-        /// <param name="scheduleTime"> The time the policy task was scheduled. </param>
-        /// <param name="deleteSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <param name="tierToCoolSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <param name="tierToArchiveSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageLifecyclePolicyCompletedEventData"/> instance for mocking. </returns>
-        public static StorageLifecyclePolicyCompletedEventData StorageLifecyclePolicyCompletedEventData(string scheduleTime = null, StorageLifecyclePolicyActionSummaryDetail deleteSummary = null, StorageLifecyclePolicyActionSummaryDetail tierToCoolSummary = null, StorageLifecyclePolicyActionSummaryDetail tierToArchiveSummary = null)
-        {
-            return new StorageLifecyclePolicyCompletedEventData(scheduleTime, deleteSummary, tierToCoolSummary, tierToArchiveSummary, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageLifecyclePolicyActionSummaryDetail"/>. </summary>
-        /// <param name="totalObjectsCount"> Total number of objects to be acted on by this action. </param>
-        /// <param name="successCount"> Number of success operations of this action. </param>
-        /// <param name="errorList"> Error messages of this action if any. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageLifecyclePolicyActionSummaryDetail"/> instance for mocking. </returns>
-        public static StorageLifecyclePolicyActionSummaryDetail StorageLifecyclePolicyActionSummaryDetail(long? totalObjectsCount = null, long? successCount = null, string errorList = null)
-        {
-            return new StorageLifecyclePolicyActionSummaryDetail(totalObjectsCount, successCount, errorList, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageBlobTierChangedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="contentType"> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </param>
-        /// <param name="contentLength"> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </param>
-        /// <param name="blobType"> The type of blob. </param>
-        /// <param name="url"> The path to the blob. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageBlobTierChangedEventData"/> instance for mocking. </returns>
-        public static StorageBlobTierChangedEventData StorageBlobTierChangedEventData(string api = null, string clientRequestId = null, string requestId = null, string contentType = null, long? contentLength = null, string blobType = null, string url = null, string sequencer = null, string identity = null, IReadOnlyDictionary<string, BinaryData> storageDiagnostics = null)
-        {
-            storageDiagnostics ??= new Dictionary<string, BinaryData>();
-
-            return new StorageBlobTierChangedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                contentType,
-                contentLength,
-                blobType,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageAsyncOperationInitiatedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="contentType"> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </param>
-        /// <param name="contentLength"> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </param>
-        /// <param name="blobType"> The type of blob. </param>
-        /// <param name="url"> The path to the blob. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageAsyncOperationInitiatedEventData"/> instance for mocking. </returns>
-        public static StorageAsyncOperationInitiatedEventData StorageAsyncOperationInitiatedEventData(string api = null, string clientRequestId = null, string requestId = null, string contentType = null, long? contentLength = null, string blobType = null, string url = null, string sequencer = null, string identity = null, IReadOnlyDictionary<string, BinaryData> storageDiagnostics = null)
-        {
-            storageDiagnostics ??= new Dictionary<string, BinaryData>();
-
-            return new StorageAsyncOperationInitiatedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                contentType,
-                contentLength,
-                blobType,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageBlobInventoryPolicyCompletedEventData"/>. </summary>
-        /// <param name="scheduleDateTime"> The time at which inventory policy was scheduled. </param>
-        /// <param name="accountName"> The account name for which inventory policy is registered. </param>
-        /// <param name="ruleName"> The rule name for inventory policy. </param>
-        /// <param name="policyRunStatus"> The status of inventory run, it can be Succeeded/PartiallySucceeded/Failed. </param>
-        /// <param name="policyRunStatusMessage"> The status message for inventory run. </param>
-        /// <param name="policyRunId"> The policy run id for inventory run. </param>
-        /// <param name="manifestBlobUrl"> The blob URL for manifest file for inventory run. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageBlobInventoryPolicyCompletedEventData"/> instance for mocking. </returns>
-        public static StorageBlobInventoryPolicyCompletedEventData StorageBlobInventoryPolicyCompletedEventData(DateTimeOffset scheduleDateTime = default, string accountName = null, string ruleName = null, string policyRunStatus = null, string policyRunStatusMessage = null, string policyRunId = null, string manifestBlobUrl = null)
-        {
-            return new StorageBlobInventoryPolicyCompletedEventData(
-                scheduleDateTime,
-                accountName,
-                ruleName,
-                policyRunStatus,
-                policyRunStatusMessage,
-                policyRunId,
-                manifestBlobUrl,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageTaskCompletedEventData"/>. </summary>
-        /// <param name="status"> The status for a storage task. </param>
-        /// <param name="completedDateTime"> The time at which a storage task was completed. </param>
-        /// <param name="taskExecutionId"> The execution id for a storage task. </param>
-        /// <param name="taskName"> The task name for a storage task. </param>
-        /// <param name="summaryReportBlobUrl"> The summary report blob url for a storage task. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageTaskCompletedEventData"/> instance for mocking. </returns>
-        public static StorageTaskCompletedEventData StorageTaskCompletedEventData(StorageTaskCompletedStatus status = default, DateTimeOffset completedDateTime = default, string taskExecutionId = null, string taskName = null, Uri summaryReportBlobUrl = null)
-        {
-            return new StorageTaskCompletedEventData(
-                status,
-                completedDateTime,
-                taskExecutionId,
-                taskName,
-                summaryReportBlobUrl,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageTaskQueuedEventData"/>. </summary>
-        /// <param name="queuedDateTime"> The time at which a storage task was queued. </param>
-        /// <param name="taskExecutionId"> The execution id for a storage task. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageTaskQueuedEventData"/> instance for mocking. </returns>
-        public static StorageTaskQueuedEventData StorageTaskQueuedEventData(DateTimeOffset queuedDateTime = default, string taskExecutionId = null)
-        {
-            return new StorageTaskQueuedEventData(queuedDateTime, taskExecutionId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageTaskAssignmentQueuedEventData"/>. </summary>
-        /// <param name="queuedOn"> The time at which a storage task was queued. </param>
-        /// <param name="taskExecutionId"> The execution id for a storage task. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageTaskAssignmentQueuedEventData"/> instance for mocking. </returns>
-        public static StorageTaskAssignmentQueuedEventData StorageTaskAssignmentQueuedEventData(DateTimeOffset queuedOn = default, string taskExecutionId = null)
-        {
-            return new StorageTaskAssignmentQueuedEventData(queuedOn, taskExecutionId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.StorageTaskAssignmentCompletedEventData"/>. </summary>
-        /// <param name="status"> The status for a storage task. </param>
-        /// <param name="completedOn"> The time at which a storage task was completed. </param>
-        /// <param name="taskExecutionId"> The execution id for a storage task. </param>
-        /// <param name="taskName"> The task name for a storage task. </param>
-        /// <param name="summaryReportBlobUri"> The summary report blob url for a storage task. </param>
-        /// <returns> A new <see cref="SystemEvents.StorageTaskAssignmentCompletedEventData"/> instance for mocking. </returns>
-        public static StorageTaskAssignmentCompletedEventData StorageTaskAssignmentCompletedEventData(StorageTaskAssignmentCompletedStatus status = default, DateTimeOffset completedOn = default, string taskExecutionId = null, string taskName = null, Uri summaryReportBlobUri = null)
-        {
-            return new StorageTaskAssignmentCompletedEventData(
-                status,
-                completedOn,
-                taskExecutionId,
-                taskName,
-                summaryReportBlobUri,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AppEventTypeDetail"/>. </summary>
-        /// <param name="action"> Type of action of the operation. </param>
-        /// <returns> A new <see cref="SystemEvents.AppEventTypeDetail"/> instance for mocking. </returns>
-        public static AppEventTypeDetail AppEventTypeDetail(AppAction action = default)
-        {
-            return new AppEventTypeDetail(action, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebAppUpdatedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebAppUpdatedEventData"/> instance for mocking. </returns>
-        public static WebAppUpdatedEventData WebAppUpdatedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebAppUpdatedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebBackupOperationStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebBackupOperationStartedEventData"/> instance for mocking. </returns>
-        public static WebBackupOperationStartedEventData WebBackupOperationStartedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebBackupOperationStartedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebBackupOperationCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebBackupOperationCompletedEventData"/> instance for mocking. </returns>
-        public static WebBackupOperationCompletedEventData WebBackupOperationCompletedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebBackupOperationCompletedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebBackupOperationFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebBackupOperationFailedEventData"/> instance for mocking. </returns>
-        public static WebBackupOperationFailedEventData WebBackupOperationFailedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebBackupOperationFailedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebRestoreOperationStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebRestoreOperationStartedEventData"/> instance for mocking. </returns>
-        public static WebRestoreOperationStartedEventData WebRestoreOperationStartedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebRestoreOperationStartedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebRestoreOperationCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebRestoreOperationCompletedEventData"/> instance for mocking. </returns>
-        public static WebRestoreOperationCompletedEventData WebRestoreOperationCompletedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebRestoreOperationCompletedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebRestoreOperationFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebRestoreOperationFailedEventData"/> instance for mocking. </returns>
-        public static WebRestoreOperationFailedEventData WebRestoreOperationFailedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebRestoreOperationFailedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebSlotSwapStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebSlotSwapStartedEventData"/> instance for mocking. </returns>
-        public static WebSlotSwapStartedEventData WebSlotSwapStartedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebSlotSwapStartedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebSlotSwapCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebSlotSwapCompletedEventData"/> instance for mocking. </returns>
-        public static WebSlotSwapCompletedEventData WebSlotSwapCompletedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebSlotSwapCompletedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebSlotSwapFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebSlotSwapFailedEventData"/> instance for mocking. </returns>
-        public static WebSlotSwapFailedEventData WebSlotSwapFailedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebSlotSwapFailedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebSlotSwapWithPreviewStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebSlotSwapWithPreviewStartedEventData"/> instance for mocking. </returns>
-        public static WebSlotSwapWithPreviewStartedEventData WebSlotSwapWithPreviewStartedEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebSlotSwapWithPreviewStartedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebSlotSwapWithPreviewCancelledEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebSlotSwapWithPreviewCancelledEventData"/> instance for mocking. </returns>
-        public static WebSlotSwapWithPreviewCancelledEventData WebSlotSwapWithPreviewCancelledEventData(AppEventTypeDetail appEventTypeDetail = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebSlotSwapWithPreviewCancelledEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebAppServicePlanUpdatedEventData"/>. </summary>
-        /// <param name="appServicePlanEventTypeDetail"> Detail of action on the app service plan. </param>
-        /// <param name="sku"> sku of app service plan. </param>
-        /// <param name="name"> name of the app service plan that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the app service plan API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the app service plan API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the app service plan API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <returns> A new <see cref="SystemEvents.WebAppServicePlanUpdatedEventData"/> instance for mocking. </returns>
-        public static WebAppServicePlanUpdatedEventData WebAppServicePlanUpdatedEventData(AppServicePlanEventTypeDetail appServicePlanEventTypeDetail = null, WebAppServicePlanUpdatedEventDataSku sku = null, string name = null, string clientRequestId = null, string correlationRequestId = null, string requestId = null, string address = null, string verb = null)
-        {
-            return new WebAppServicePlanUpdatedEventData(
-                appServicePlanEventTypeDetail,
-                sku,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.AppServicePlanEventTypeDetail"/>. </summary>
-        /// <param name="stampKind"> Kind of environment where app service plan is. </param>
-        /// <param name="action"> Type of action on the app service plan. </param>
-        /// <param name="status"> Asynchronous operation status of the operation on the app service plan. </param>
-        /// <returns> A new <see cref="SystemEvents.AppServicePlanEventTypeDetail"/> instance for mocking. </returns>
-        public static AppServicePlanEventTypeDetail AppServicePlanEventTypeDetail(StampKind stampKind = default, AppServicePlanAction action = default, AsyncStatus status = default)
-        {
-            return new AppServicePlanEventTypeDetail(stampKind, action, status, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.WebAppServicePlanUpdatedEventDataSku"/>. </summary>
-        /// <param name="name"> name of app service plan sku. </param>
-        /// <param name="tier"> tier of app service plan sku. </param>
-        /// <param name="size"> size of app service plan sku. </param>
-        /// <param name="family"> family of app service plan sku. </param>
-        /// <param name="capacity"> capacity of app service plan sku. </param>
-        /// <returns> A new <see cref="SystemEvents.WebAppServicePlanUpdatedEventDataSku"/> instance for mocking. </returns>
-        public static WebAppServicePlanUpdatedEventDataSku WebAppServicePlanUpdatedEventDataSku(string name = null, string tier = null, string size = null, string family = null, string capacity = null)
-        {
-            return new WebAppServicePlanUpdatedEventDataSku(
-                name,
-                tier,
-                size,
-                family,
-                capacity,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.SubscriptionValidationEventData"/>. </summary>
-        /// <param name="validationCode">
-        /// The validation code sent by Azure Event Grid to validate an event subscription.
-        /// To complete the validation handshake, the subscriber must either respond with this validation code as part of the validation response,
-        /// or perform a GET request on the validationUrl (available starting version 2018-05-01-preview).
-        /// </param>
-        /// <param name="validationUrl">
-        /// The validation URL sent by Azure Event Grid (available starting version 2018-05-01-preview).
-        /// To complete the validation handshake, the subscriber must either respond with the validationCode as part of the validation response,
-        /// or perform a GET request on the validationUrl (available starting version 2018-05-01-preview).
-        /// </param>
-        /// <returns> A new <see cref="SystemEvents.SubscriptionValidationEventData"/> instance for mocking. </returns>
-        public static SubscriptionValidationEventData SubscriptionValidationEventData(string validationCode = null, string validationUrl = null)
-        {
-            return new SubscriptionValidationEventData(validationCode, validationUrl, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.SubscriptionValidationResponse"/>. </summary>
-        /// <param name="validationResponse"> The validation response sent by the subscriber to Azure Event Grid to complete the validation of an event subscription. </param>
-        /// <returns> A new <see cref="SystemEvents.SubscriptionValidationResponse"/> instance for mocking. </returns>
-        public static SubscriptionValidationResponse SubscriptionValidationResponse(string validationResponse = null)
-        {
-            return new SubscriptionValidationResponse(validationResponse, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.SubscriptionDeletedEventData"/>. </summary>
-        /// <param name="eventSubscriptionId"> The Azure resource ID of the deleted event subscription. </param>
-        /// <returns> A new <see cref="SystemEvents.SubscriptionDeletedEventData"/> instance for mocking. </returns>
-        public static SubscriptionDeletedEventData SubscriptionDeletedEventData(string eventSubscriptionId = null)
-        {
-            return new SubscriptionDeletedEventData(eventSubscriptionId, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.EventGridMQTTClientEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <returns> A new <see cref="SystemEvents.EventGridMQTTClientEventData"/> instance for mocking. </returns>
-        public static EventGridMQTTClientEventData EventGridMQTTClientEventData(string clientAuthenticationName = null, string clientName = null, string namespaceName = null)
-        {
-            return new EventGridMQTTClientEventData(clientAuthenticationName, clientName, namespaceName, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.EventGridMQTTClientCreatedOrUpdatedEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <param name="state"> Configured state of the client. The value could be Enabled or Disabled. </param>
-        /// <param name="createdOn"> Time the client resource is created based on the provider's UTC time. </param>
-        /// <param name="updatedOn">
-        /// Time the client resource is last updated based on the provider's UTC time. If
-        /// the client resource was never updated, this value is identical to the value of
-        /// the 'createdOn' property.
-        /// </param>
-        /// <param name="attributes"> The key-value attributes that are assigned to the client resource. </param>
-        /// <returns> A new <see cref="SystemEvents.EventGridMQTTClientCreatedOrUpdatedEventData"/> instance for mocking. </returns>
-        public static EventGridMQTTClientCreatedOrUpdatedEventData EventGridMQTTClientCreatedOrUpdatedEventData(string clientAuthenticationName = null, string clientName = null, string namespaceName = null, EventGridMQTTClientState state = default, DateTimeOffset createdOn = default, DateTimeOffset updatedOn = default, IReadOnlyDictionary<string, string> attributes = null)
-        {
-            attributes ??= new Dictionary<string, string>();
-
-            return new EventGridMQTTClientCreatedOrUpdatedEventData(
-                clientAuthenticationName,
-                clientName,
-                namespaceName,
-                serializedAdditionalRawData: null,
-                state,
-                createdOn,
-                updatedOn,
-                attributes);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.EventGridMQTTClientDeletedEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <returns> A new <see cref="SystemEvents.EventGridMQTTClientDeletedEventData"/> instance for mocking. </returns>
-        public static EventGridMQTTClientDeletedEventData EventGridMQTTClientDeletedEventData(string clientAuthenticationName = null, string clientName = null, string namespaceName = null)
-        {
-            return new EventGridMQTTClientDeletedEventData(clientAuthenticationName, clientName, namespaceName, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.EventGridMQTTClientSessionConnectedEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <param name="clientSessionName">
-        /// Unique identifier for the MQTT client's session. This case-sensitive string can
-        /// be up to 128 characters long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="sequenceNumber">
-        /// A number that helps indicate order of MQTT client session connected or
-        /// disconnected events. Latest event will have a sequence number that is higher
-        /// than the previous event.
-        /// </param>
-        /// <returns> A new <see cref="SystemEvents.EventGridMQTTClientSessionConnectedEventData"/> instance for mocking. </returns>
-        public static EventGridMQTTClientSessionConnectedEventData EventGridMQTTClientSessionConnectedEventData(string clientAuthenticationName = null, string clientName = null, string namespaceName = null, string clientSessionName = null, long? sequenceNumber = null)
-        {
-            return new EventGridMQTTClientSessionConnectedEventData(
-                clientAuthenticationName,
-                clientName,
-                namespaceName,
-                serializedAdditionalRawData: null,
-                clientSessionName,
-                sequenceNumber);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.EventGridMQTTClientSessionDisconnectedEventData"/>. </summary>
-        /// <param name="clientAuthenticationName">
-        /// Unique identifier for the MQTT client that the client presents to the service
-        /// for authentication. This case-sensitive string can be up to 128 characters
-        /// long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="clientName"> Name of the client resource in the Event Grid namespace. </param>
-        /// <param name="namespaceName"> Name of the Event Grid namespace where the MQTT client was created or updated. </param>
-        /// <param name="clientSessionName">
-        /// Unique identifier for the MQTT client's session. This case-sensitive string can
-        /// be up to 128 characters long, and supports UTF-8 characters.
-        /// </param>
-        /// <param name="sequenceNumber">
-        /// A number that helps indicate order of MQTT client session connected or
-        /// disconnected events. Latest event will have a sequence number that is higher
-        /// than the previous event.
-        /// </param>
-        /// <param name="disconnectionReason">
-        /// Reason for the disconnection of the MQTT client's session. The value could be
-        /// one of the values in the disconnection reasons table.
-        /// </param>
-        /// <returns> A new <see cref="SystemEvents.EventGridMQTTClientSessionDisconnectedEventData"/> instance for mocking. </returns>
-        public static EventGridMQTTClientSessionDisconnectedEventData EventGridMQTTClientSessionDisconnectedEventData(string clientAuthenticationName = null, string clientName = null, string namespaceName = null, string clientSessionName = null, long? sequenceNumber = null, EventGridMQTTClientDisconnectionReason disconnectionReason = default)
-        {
-            return new EventGridMQTTClientSessionDisconnectedEventData(
-                clientAuthenticationName,
-                clientName,
-                namespaceName,
-                serializedAdditionalRawData: null,
-                clientSessionName,
-                sequenceNumber,
-                disconnectionReason);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsResourceUpdatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="apiVersion"> api version of the resource properties bag. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsResourceUpdatedEventData"/> instance for mocking. </returns>
-        public static ResourceNotificationsResourceUpdatedEventData ResourceNotificationsResourceUpdatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails = null, ResourceNotificationsOperationalDetails operationalDetails = null, string apiVersion = null)
-        {
-            return new ResourceNotificationsResourceUpdatedEventData(resourceDetails, operationalDetails, apiVersion, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsResourceUpdatedDetails"/>. </summary>
-        /// <param name="id"> id of the resource for which the event is being emitted. </param>
-        /// <param name="name"> name of the resource for which the event is being emitted. </param>
-        /// <param name="type"> the type of the resource for which the event is being emitted. </param>
-        /// <param name="location"> the location of the resource for which the event is being emitted. </param>
-        /// <param name="tags"> the tags on the resource for which the event is being emitted. </param>
-        /// <param name="properties"> properties in the payload of the resource for which the event is being emitted. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsResourceUpdatedDetails"/> instance for mocking. </returns>
-        public static ResourceNotificationsResourceUpdatedDetails ResourceNotificationsResourceUpdatedDetails(string id = null, string name = null, string type = null, string location = null, IReadOnlyDictionary<string, string> tags = null, IReadOnlyDictionary<string, BinaryData> properties = null)
-        {
-            tags ??= new Dictionary<string, string>();
-            properties ??= new Dictionary<string, BinaryData>();
-
-            return new ResourceNotificationsResourceUpdatedDetails(
-                id,
-                name,
-                type,
-                location,
-                tags,
-                properties,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsOperationalDetails"/>. </summary>
-        /// <param name="resourceEventTime"> Date and Time when resource was updated. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsOperationalDetails"/> instance for mocking. </returns>
-        public static ResourceNotificationsOperationalDetails ResourceNotificationsOperationalDetails(DateTimeOffset resourceEventTime = default)
-        {
-            return new ResourceNotificationsOperationalDetails(resourceEventTime, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="apiVersion"> api version of the resource properties bag. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData"/> instance for mocking. </returns>
-        public static ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails = null, ResourceNotificationsOperationalDetails operationalDetails = null, string apiVersion = null)
-        {
-            return new ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(resourceDetails, operationalDetails, apiVersion, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsHealthResourcesAnnotatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="apiVersion"> api version of the resource properties bag. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsHealthResourcesAnnotatedEventData"/> instance for mocking. </returns>
-        public static ResourceNotificationsHealthResourcesAnnotatedEventData ResourceNotificationsHealthResourcesAnnotatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails = null, ResourceNotificationsOperationalDetails operationalDetails = null, string apiVersion = null)
-        {
-            return new ResourceNotificationsHealthResourcesAnnotatedEventData(resourceDetails, operationalDetails, apiVersion, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsResourceManagementCreatedOrUpdatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="apiVersion"> api version of the resource properties bag. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsResourceManagementCreatedOrUpdatedEventData"/> instance for mocking. </returns>
-        public static ResourceNotificationsResourceManagementCreatedOrUpdatedEventData ResourceNotificationsResourceManagementCreatedOrUpdatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails = null, ResourceNotificationsOperationalDetails operationalDetails = null, string apiVersion = null)
-        {
-            return new ResourceNotificationsResourceManagementCreatedOrUpdatedEventData(resourceDetails, operationalDetails, apiVersion, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsResourceDeletedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for delete event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsResourceDeletedEventData"/> instance for mocking. </returns>
-        public static ResourceNotificationsResourceDeletedEventData ResourceNotificationsResourceDeletedEventData(ResourceNotificationsResourceDeletedDetails resourceDetails = null, ResourceNotificationsOperationalDetails operationalDetails = null)
-        {
-            return new ResourceNotificationsResourceDeletedEventData(resourceDetails, operationalDetails, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsResourceDeletedDetails"/>. </summary>
-        /// <param name="id"> id of the resource for which the event is being emitted. </param>
-        /// <param name="name"> name of the resource for which the event is being emitted. </param>
-        /// <param name="type"> the type of the resource for which the event is being emitted. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsResourceDeletedDetails"/> instance for mocking. </returns>
-        public static ResourceNotificationsResourceDeletedDetails ResourceNotificationsResourceDeletedDetails(string id = null, string name = null, string type = null)
-        {
-            return new ResourceNotificationsResourceDeletedDetails(id, name, type, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SystemEvents.ResourceNotificationsResourceManagementDeletedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for delete event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <returns> A new <see cref="SystemEvents.ResourceNotificationsResourceManagementDeletedEventData"/> instance for mocking. </returns>
-        public static ResourceNotificationsResourceManagementDeletedEventData ResourceNotificationsResourceManagementDeletedEventData(ResourceNotificationsResourceDeletedDetails resourceDetails = null, ResourceNotificationsOperationalDetails operationalDetails = null)
-        {
-            return new ResourceNotificationsResourceManagementDeletedEventData(resourceDetails, operationalDetails, serializedAdditionalRawData: null);
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventHubCaptureFileCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventHubCaptureFileCreatedEventData.Serialization.cs
deleted file mode 100644
index 1df0132a3c36..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventHubCaptureFileCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class EventHubCaptureFileCreatedEventData : IUtf8JsonSerializable, IJsonModel<EventHubCaptureFileCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EventHubCaptureFileCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<EventHubCaptureFileCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventHubCaptureFileCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventHubCaptureFileCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Fileurl))
-            {
-                writer.WritePropertyName("fileUrl"u8);
-                writer.WriteStringValue(Fileurl);
-            }
-            if (Optional.IsDefined(FileType))
-            {
-                writer.WritePropertyName("fileType"u8);
-                writer.WriteStringValue(FileType);
-            }
-            if (Optional.IsDefined(PartitionId))
-            {
-                writer.WritePropertyName("partitionId"u8);
-                writer.WriteStringValue(PartitionId);
-            }
-            if (Optional.IsDefined(SizeInBytes))
-            {
-                writer.WritePropertyName("sizeInBytes"u8);
-                writer.WriteNumberValue(SizeInBytes.Value);
-            }
-            if (Optional.IsDefined(EventCount))
-            {
-                writer.WritePropertyName("eventCount"u8);
-                writer.WriteNumberValue(EventCount.Value);
-            }
-            if (Optional.IsDefined(FirstSequenceNumber))
-            {
-                writer.WritePropertyName("firstSequenceNumber"u8);
-                writer.WriteNumberValue(FirstSequenceNumber.Value);
-            }
-            if (Optional.IsDefined(LastSequenceNumber))
-            {
-                writer.WritePropertyName("lastSequenceNumber"u8);
-                writer.WriteNumberValue(LastSequenceNumber.Value);
-            }
-            writer.WritePropertyName("firstEnqueueTime"u8);
-            writer.WriteStringValue(FirstEnqueueTime, "O");
-            writer.WritePropertyName("lastEnqueueTime"u8);
-            writer.WriteStringValue(LastEnqueueTime, "O");
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        EventHubCaptureFileCreatedEventData IJsonModel<EventHubCaptureFileCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventHubCaptureFileCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(EventHubCaptureFileCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeEventHubCaptureFileCreatedEventData(document.RootElement, options);
-        }
-
-        internal static EventHubCaptureFileCreatedEventData DeserializeEventHubCaptureFileCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string fileUrl = default;
-            string fileType = default;
-            string partitionId = default;
-            int? sizeInBytes = default;
-            int? eventCount = default;
-            int? firstSequenceNumber = default;
-            int? lastSequenceNumber = default;
-            DateTimeOffset firstEnqueueTime = default;
-            DateTimeOffset lastEnqueueTime = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("fileUrl"u8))
-                {
-                    fileUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("fileType"u8))
-                {
-                    fileType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("partitionId"u8))
-                {
-                    partitionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sizeInBytes"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    sizeInBytes = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("eventCount"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    eventCount = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("firstSequenceNumber"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    firstSequenceNumber = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("lastSequenceNumber"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    lastSequenceNumber = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("firstEnqueueTime"u8))
-                {
-                    firstEnqueueTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("lastEnqueueTime"u8))
-                {
-                    lastEnqueueTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new EventHubCaptureFileCreatedEventData(
-                fileUrl,
-                fileType,
-                partitionId,
-                sizeInBytes,
-                eventCount,
-                firstSequenceNumber,
-                lastSequenceNumber,
-                firstEnqueueTime,
-                lastEnqueueTime,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<EventHubCaptureFileCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventHubCaptureFileCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(EventHubCaptureFileCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        EventHubCaptureFileCreatedEventData IPersistableModel<EventHubCaptureFileCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<EventHubCaptureFileCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeEventHubCaptureFileCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(EventHubCaptureFileCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<EventHubCaptureFileCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static EventHubCaptureFileCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeEventHubCaptureFileCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventHubCaptureFileCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventHubCaptureFileCreatedEventData.cs
deleted file mode 100644
index 0c670ab7b195..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/EventHubCaptureFileCreatedEventData.cs
+++ /dev/null
@@ -1,106 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.EventHub.CaptureFileCreated event. </summary>
-    public partial class EventHubCaptureFileCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="EventHubCaptureFileCreatedEventData"/>. </summary>
-        /// <param name="firstEnqueueTime"> The first time from the queue. </param>
-        /// <param name="lastEnqueueTime"> The last time from the queue. </param>
-        internal EventHubCaptureFileCreatedEventData(DateTimeOffset firstEnqueueTime, DateTimeOffset lastEnqueueTime)
-        {
-            FirstEnqueueTime = firstEnqueueTime;
-            LastEnqueueTime = lastEnqueueTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventHubCaptureFileCreatedEventData"/>. </summary>
-        /// <param name="fileurl"> The path to the capture file. </param>
-        /// <param name="fileType"> The file type of the capture file. </param>
-        /// <param name="partitionId"> The shard ID. </param>
-        /// <param name="sizeInBytes"> The file size. </param>
-        /// <param name="eventCount"> The number of events in the file. </param>
-        /// <param name="firstSequenceNumber"> The smallest sequence number from the queue. </param>
-        /// <param name="lastSequenceNumber"> The last sequence number from the queue. </param>
-        /// <param name="firstEnqueueTime"> The first time from the queue. </param>
-        /// <param name="lastEnqueueTime"> The last time from the queue. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal EventHubCaptureFileCreatedEventData(string fileurl, string fileType, string partitionId, int? sizeInBytes, int? eventCount, int? firstSequenceNumber, int? lastSequenceNumber, DateTimeOffset firstEnqueueTime, DateTimeOffset lastEnqueueTime, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Fileurl = fileurl;
-            FileType = fileType;
-            PartitionId = partitionId;
-            SizeInBytes = sizeInBytes;
-            EventCount = eventCount;
-            FirstSequenceNumber = firstSequenceNumber;
-            LastSequenceNumber = lastSequenceNumber;
-            FirstEnqueueTime = firstEnqueueTime;
-            LastEnqueueTime = lastEnqueueTime;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="EventHubCaptureFileCreatedEventData"/> for deserialization. </summary>
-        internal EventHubCaptureFileCreatedEventData()
-        {
-        }
-
-        /// <summary> The path to the capture file. </summary>
-        public string Fileurl { get; }
-        /// <summary> The file type of the capture file. </summary>
-        public string FileType { get; }
-        /// <summary> The shard ID. </summary>
-        public string PartitionId { get; }
-        /// <summary> The file size. </summary>
-        public int? SizeInBytes { get; }
-        /// <summary> The number of events in the file. </summary>
-        public int? EventCount { get; }
-        /// <summary> The smallest sequence number from the queue. </summary>
-        public int? FirstSequenceNumber { get; }
-        /// <summary> The last sequence number from the queue. </summary>
-        public int? LastSequenceNumber { get; }
-        /// <summary> The first time from the queue. </summary>
-        public DateTimeOffset FirstEnqueueTime { get; }
-        /// <summary> The last time from the queue. </summary>
-        public DateTimeOffset LastEnqueueTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageCreatedEventData.Serialization.cs
deleted file mode 100644
index feacefff2563..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class HealthcareDicomImageCreatedEventData : IUtf8JsonSerializable, IJsonModel<HealthcareDicomImageCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<HealthcareDicomImageCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<HealthcareDicomImageCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareDicomImageCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(PartitionName))
-            {
-                writer.WritePropertyName("partitionName"u8);
-                writer.WriteStringValue(PartitionName);
-            }
-            if (Optional.IsDefined(ImageStudyInstanceUid))
-            {
-                writer.WritePropertyName("imageStudyInstanceUid"u8);
-                writer.WriteStringValue(ImageStudyInstanceUid);
-            }
-            if (Optional.IsDefined(ImageSeriesInstanceUid))
-            {
-                writer.WritePropertyName("imageSeriesInstanceUid"u8);
-                writer.WriteStringValue(ImageSeriesInstanceUid);
-            }
-            if (Optional.IsDefined(ImageSopInstanceUid))
-            {
-                writer.WritePropertyName("imageSopInstanceUid"u8);
-                writer.WriteStringValue(ImageSopInstanceUid);
-            }
-            if (Optional.IsDefined(ServiceHostName))
-            {
-                writer.WritePropertyName("serviceHostName"u8);
-                writer.WriteStringValue(ServiceHostName);
-            }
-            if (Optional.IsDefined(SequenceNumber))
-            {
-                writer.WritePropertyName("sequenceNumber"u8);
-                writer.WriteNumberValue(SequenceNumber.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        HealthcareDicomImageCreatedEventData IJsonModel<HealthcareDicomImageCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareDicomImageCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeHealthcareDicomImageCreatedEventData(document.RootElement, options);
-        }
-
-        internal static HealthcareDicomImageCreatedEventData DeserializeHealthcareDicomImageCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string partitionName = default;
-            string imageStudyInstanceUid = default;
-            string imageSeriesInstanceUid = default;
-            string imageSopInstanceUid = default;
-            string serviceHostName = default;
-            long? sequenceNumber = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("partitionName"u8))
-                {
-                    partitionName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageStudyInstanceUid"u8))
-                {
-                    imageStudyInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageSeriesInstanceUid"u8))
-                {
-                    imageSeriesInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageSopInstanceUid"u8))
-                {
-                    imageSopInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("serviceHostName"u8))
-                {
-                    serviceHostName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequenceNumber"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    sequenceNumber = property.Value.GetInt64();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new HealthcareDicomImageCreatedEventData(
-                partitionName,
-                imageStudyInstanceUid,
-                imageSeriesInstanceUid,
-                imageSopInstanceUid,
-                serviceHostName,
-                sequenceNumber,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<HealthcareDicomImageCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareDicomImageCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        HealthcareDicomImageCreatedEventData IPersistableModel<HealthcareDicomImageCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeHealthcareDicomImageCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareDicomImageCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<HealthcareDicomImageCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static HealthcareDicomImageCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeHealthcareDicomImageCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageCreatedEventData.cs
deleted file mode 100644
index debb8542d70c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageCreatedEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.DicomImageCreated event. </summary>
-    public partial class HealthcareDicomImageCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareDicomImageCreatedEventData"/>. </summary>
-        internal HealthcareDicomImageCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareDicomImageCreatedEventData"/>. </summary>
-        /// <param name="partitionName"> Data partition name. </param>
-        /// <param name="imageStudyInstanceUid"> Unique identifier for the Study. </param>
-        /// <param name="imageSeriesInstanceUid"> Unique identifier for the Series. </param>
-        /// <param name="imageSopInstanceUid"> Unique identifier for the DICOM Image. </param>
-        /// <param name="serviceHostName"> Domain name of the DICOM account for this image. </param>
-        /// <param name="sequenceNumber"> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation and deletion within the service. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal HealthcareDicomImageCreatedEventData(string partitionName, string imageStudyInstanceUid, string imageSeriesInstanceUid, string imageSopInstanceUid, string serviceHostName, long? sequenceNumber, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            PartitionName = partitionName;
-            ImageStudyInstanceUid = imageStudyInstanceUid;
-            ImageSeriesInstanceUid = imageSeriesInstanceUid;
-            ImageSopInstanceUid = imageSopInstanceUid;
-            ServiceHostName = serviceHostName;
-            SequenceNumber = sequenceNumber;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Data partition name. </summary>
-        public string PartitionName { get; }
-        /// <summary> Unique identifier for the Study. </summary>
-        public string ImageStudyInstanceUid { get; }
-        /// <summary> Unique identifier for the Series. </summary>
-        public string ImageSeriesInstanceUid { get; }
-        /// <summary> Unique identifier for the DICOM Image. </summary>
-        public string ImageSopInstanceUid { get; }
-        /// <summary> Domain name of the DICOM account for this image. </summary>
-        public string ServiceHostName { get; }
-        /// <summary> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation and deletion within the service. </summary>
-        public long? SequenceNumber { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageDeletedEventData.Serialization.cs
deleted file mode 100644
index bb9a3dfd42ae..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class HealthcareDicomImageDeletedEventData : IUtf8JsonSerializable, IJsonModel<HealthcareDicomImageDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<HealthcareDicomImageDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<HealthcareDicomImageDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareDicomImageDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(PartitionName))
-            {
-                writer.WritePropertyName("partitionName"u8);
-                writer.WriteStringValue(PartitionName);
-            }
-            if (Optional.IsDefined(ImageStudyInstanceUid))
-            {
-                writer.WritePropertyName("imageStudyInstanceUid"u8);
-                writer.WriteStringValue(ImageStudyInstanceUid);
-            }
-            if (Optional.IsDefined(ImageSeriesInstanceUid))
-            {
-                writer.WritePropertyName("imageSeriesInstanceUid"u8);
-                writer.WriteStringValue(ImageSeriesInstanceUid);
-            }
-            if (Optional.IsDefined(ImageSopInstanceUid))
-            {
-                writer.WritePropertyName("imageSopInstanceUid"u8);
-                writer.WriteStringValue(ImageSopInstanceUid);
-            }
-            if (Optional.IsDefined(ServiceHostName))
-            {
-                writer.WritePropertyName("serviceHostName"u8);
-                writer.WriteStringValue(ServiceHostName);
-            }
-            if (Optional.IsDefined(SequenceNumber))
-            {
-                writer.WritePropertyName("sequenceNumber"u8);
-                writer.WriteNumberValue(SequenceNumber.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        HealthcareDicomImageDeletedEventData IJsonModel<HealthcareDicomImageDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareDicomImageDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeHealthcareDicomImageDeletedEventData(document.RootElement, options);
-        }
-
-        internal static HealthcareDicomImageDeletedEventData DeserializeHealthcareDicomImageDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string partitionName = default;
-            string imageStudyInstanceUid = default;
-            string imageSeriesInstanceUid = default;
-            string imageSopInstanceUid = default;
-            string serviceHostName = default;
-            long? sequenceNumber = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("partitionName"u8))
-                {
-                    partitionName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageStudyInstanceUid"u8))
-                {
-                    imageStudyInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageSeriesInstanceUid"u8))
-                {
-                    imageSeriesInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageSopInstanceUid"u8))
-                {
-                    imageSopInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("serviceHostName"u8))
-                {
-                    serviceHostName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequenceNumber"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    sequenceNumber = property.Value.GetInt64();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new HealthcareDicomImageDeletedEventData(
-                partitionName,
-                imageStudyInstanceUid,
-                imageSeriesInstanceUid,
-                imageSopInstanceUid,
-                serviceHostName,
-                sequenceNumber,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<HealthcareDicomImageDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareDicomImageDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        HealthcareDicomImageDeletedEventData IPersistableModel<HealthcareDicomImageDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeHealthcareDicomImageDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareDicomImageDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<HealthcareDicomImageDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static HealthcareDicomImageDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeHealthcareDicomImageDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageDeletedEventData.cs
deleted file mode 100644
index abac35f2b0bc..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageDeletedEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.DicomImageDeleted event. </summary>
-    public partial class HealthcareDicomImageDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareDicomImageDeletedEventData"/>. </summary>
-        internal HealthcareDicomImageDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareDicomImageDeletedEventData"/>. </summary>
-        /// <param name="partitionName"> Data partition name. </param>
-        /// <param name="imageStudyInstanceUid"> Unique identifier for the Study. </param>
-        /// <param name="imageSeriesInstanceUid"> Unique identifier for the Series. </param>
-        /// <param name="imageSopInstanceUid"> Unique identifier for the DICOM Image. </param>
-        /// <param name="serviceHostName"> Host name of the DICOM account for this image. </param>
-        /// <param name="sequenceNumber"> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation and deletion within the service. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal HealthcareDicomImageDeletedEventData(string partitionName, string imageStudyInstanceUid, string imageSeriesInstanceUid, string imageSopInstanceUid, string serviceHostName, long? sequenceNumber, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            PartitionName = partitionName;
-            ImageStudyInstanceUid = imageStudyInstanceUid;
-            ImageSeriesInstanceUid = imageSeriesInstanceUid;
-            ImageSopInstanceUid = imageSopInstanceUid;
-            ServiceHostName = serviceHostName;
-            SequenceNumber = sequenceNumber;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Data partition name. </summary>
-        public string PartitionName { get; }
-        /// <summary> Unique identifier for the Study. </summary>
-        public string ImageStudyInstanceUid { get; }
-        /// <summary> Unique identifier for the Series. </summary>
-        public string ImageSeriesInstanceUid { get; }
-        /// <summary> Unique identifier for the DICOM Image. </summary>
-        public string ImageSopInstanceUid { get; }
-        /// <summary> Host name of the DICOM account for this image. </summary>
-        public string ServiceHostName { get; }
-        /// <summary> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation and deletion within the service. </summary>
-        public long? SequenceNumber { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageUpdatedEventData.Serialization.cs
deleted file mode 100644
index 54bba1c9d572..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class HealthcareDicomImageUpdatedEventData : IUtf8JsonSerializable, IJsonModel<HealthcareDicomImageUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<HealthcareDicomImageUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<HealthcareDicomImageUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareDicomImageUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(PartitionName))
-            {
-                writer.WritePropertyName("partitionName"u8);
-                writer.WriteStringValue(PartitionName);
-            }
-            if (Optional.IsDefined(ImageStudyInstanceUid))
-            {
-                writer.WritePropertyName("imageStudyInstanceUid"u8);
-                writer.WriteStringValue(ImageStudyInstanceUid);
-            }
-            if (Optional.IsDefined(ImageSeriesInstanceUid))
-            {
-                writer.WritePropertyName("imageSeriesInstanceUid"u8);
-                writer.WriteStringValue(ImageSeriesInstanceUid);
-            }
-            if (Optional.IsDefined(ImageSopInstanceUid))
-            {
-                writer.WritePropertyName("imageSopInstanceUid"u8);
-                writer.WriteStringValue(ImageSopInstanceUid);
-            }
-            if (Optional.IsDefined(ServiceHostName))
-            {
-                writer.WritePropertyName("serviceHostName"u8);
-                writer.WriteStringValue(ServiceHostName);
-            }
-            if (Optional.IsDefined(SequenceNumber))
-            {
-                writer.WritePropertyName("sequenceNumber"u8);
-                writer.WriteNumberValue(SequenceNumber.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        HealthcareDicomImageUpdatedEventData IJsonModel<HealthcareDicomImageUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareDicomImageUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeHealthcareDicomImageUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static HealthcareDicomImageUpdatedEventData DeserializeHealthcareDicomImageUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string partitionName = default;
-            string imageStudyInstanceUid = default;
-            string imageSeriesInstanceUid = default;
-            string imageSopInstanceUid = default;
-            string serviceHostName = default;
-            long? sequenceNumber = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("partitionName"u8))
-                {
-                    partitionName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageStudyInstanceUid"u8))
-                {
-                    imageStudyInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageSeriesInstanceUid"u8))
-                {
-                    imageSeriesInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("imageSopInstanceUid"u8))
-                {
-                    imageSopInstanceUid = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("serviceHostName"u8))
-                {
-                    serviceHostName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequenceNumber"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    sequenceNumber = property.Value.GetInt64();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new HealthcareDicomImageUpdatedEventData(
-                partitionName,
-                imageStudyInstanceUid,
-                imageSeriesInstanceUid,
-                imageSopInstanceUid,
-                serviceHostName,
-                sequenceNumber,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<HealthcareDicomImageUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareDicomImageUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        HealthcareDicomImageUpdatedEventData IPersistableModel<HealthcareDicomImageUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareDicomImageUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeHealthcareDicomImageUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareDicomImageUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<HealthcareDicomImageUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static HealthcareDicomImageUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeHealthcareDicomImageUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageUpdatedEventData.cs
deleted file mode 100644
index eb248a7f72ad..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareDicomImageUpdatedEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.DicomImageUpdated event. </summary>
-    public partial class HealthcareDicomImageUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareDicomImageUpdatedEventData"/>. </summary>
-        internal HealthcareDicomImageUpdatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareDicomImageUpdatedEventData"/>. </summary>
-        /// <param name="partitionName"> Data partition name. </param>
-        /// <param name="imageStudyInstanceUid"> Unique identifier for the Study. </param>
-        /// <param name="imageSeriesInstanceUid"> Unique identifier for the Series. </param>
-        /// <param name="imageSopInstanceUid"> Unique identifier for the DICOM Image. </param>
-        /// <param name="serviceHostName"> Domain name of the DICOM account for this image. </param>
-        /// <param name="sequenceNumber"> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation, updation and deletion within the service. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal HealthcareDicomImageUpdatedEventData(string partitionName, string imageStudyInstanceUid, string imageSeriesInstanceUid, string imageSopInstanceUid, string serviceHostName, long? sequenceNumber, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            PartitionName = partitionName;
-            ImageStudyInstanceUid = imageStudyInstanceUid;
-            ImageSeriesInstanceUid = imageSeriesInstanceUid;
-            ImageSopInstanceUid = imageSopInstanceUid;
-            ServiceHostName = serviceHostName;
-            SequenceNumber = sequenceNumber;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Data partition name. </summary>
-        public string PartitionName { get; }
-        /// <summary> Unique identifier for the Study. </summary>
-        public string ImageStudyInstanceUid { get; }
-        /// <summary> Unique identifier for the Series. </summary>
-        public string ImageSeriesInstanceUid { get; }
-        /// <summary> Unique identifier for the DICOM Image. </summary>
-        public string ImageSopInstanceUid { get; }
-        /// <summary> Domain name of the DICOM account for this image. </summary>
-        public string ServiceHostName { get; }
-        /// <summary> Sequence number of the DICOM Service within Azure Health Data Services. It is unique for every image creation, updation and deletion within the service. </summary>
-        public long? SequenceNumber { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceCreatedEventData.Serialization.cs
deleted file mode 100644
index 5750aeda70b5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class HealthcareFhirResourceCreatedEventData : IUtf8JsonSerializable, IJsonModel<HealthcareFhirResourceCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<HealthcareFhirResourceCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<HealthcareFhirResourceCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareFhirResourceCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("resourceType"u8);
-            writer.WriteStringValue(FhirResourceType.ToString());
-            if (Optional.IsDefined(FhirServiceHostName))
-            {
-                writer.WritePropertyName("resourceFhirAccount"u8);
-                writer.WriteStringValue(FhirServiceHostName);
-            }
-            if (Optional.IsDefined(FhirResourceId))
-            {
-                writer.WritePropertyName("resourceFhirId"u8);
-                writer.WriteStringValue(FhirResourceId);
-            }
-            if (Optional.IsDefined(FhirResourceVersionId))
-            {
-                writer.WritePropertyName("resourceVersionId"u8);
-                writer.WriteNumberValue(FhirResourceVersionId.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        HealthcareFhirResourceCreatedEventData IJsonModel<HealthcareFhirResourceCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareFhirResourceCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeHealthcareFhirResourceCreatedEventData(document.RootElement, options);
-        }
-
-        internal static HealthcareFhirResourceCreatedEventData DeserializeHealthcareFhirResourceCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            HealthcareFhirResourceType resourceType = default;
-            string resourceFhirAccount = default;
-            string resourceFhirId = default;
-            long? resourceVersionId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceType"u8))
-                {
-                    resourceType = new HealthcareFhirResourceType(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("resourceFhirAccount"u8))
-                {
-                    resourceFhirAccount = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceFhirId"u8))
-                {
-                    resourceFhirId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceVersionId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    resourceVersionId = property.Value.GetInt64();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new HealthcareFhirResourceCreatedEventData(resourceType, resourceFhirAccount, resourceFhirId, resourceVersionId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<HealthcareFhirResourceCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareFhirResourceCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        HealthcareFhirResourceCreatedEventData IPersistableModel<HealthcareFhirResourceCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeHealthcareFhirResourceCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareFhirResourceCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<HealthcareFhirResourceCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static HealthcareFhirResourceCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeHealthcareFhirResourceCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceCreatedEventData.cs
deleted file mode 100644
index ed48894c3e41..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceCreatedEventData.cs
+++ /dev/null
@@ -1,84 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.FhirResourceCreated event. </summary>
-    public partial class HealthcareFhirResourceCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceCreatedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        internal HealthcareFhirResourceCreatedEventData(HealthcareFhirResourceType fhirResourceType)
-        {
-            FhirResourceType = fhirResourceType;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceCreatedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        /// <param name="fhirServiceHostName"> Domain name of FHIR account for this resource. </param>
-        /// <param name="fhirResourceId"> Id of HL7 FHIR resource. </param>
-        /// <param name="fhirResourceVersionId"> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal HealthcareFhirResourceCreatedEventData(HealthcareFhirResourceType fhirResourceType, string fhirServiceHostName, string fhirResourceId, long? fhirResourceVersionId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            FhirResourceType = fhirResourceType;
-            FhirServiceHostName = fhirServiceHostName;
-            FhirResourceId = fhirResourceId;
-            FhirResourceVersionId = fhirResourceVersionId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceCreatedEventData"/> for deserialization. </summary>
-        internal HealthcareFhirResourceCreatedEventData()
-        {
-        }
-
-        /// <summary> Type of HL7 FHIR resource. </summary>
-        public HealthcareFhirResourceType FhirResourceType { get; }
-        /// <summary> Domain name of FHIR account for this resource. </summary>
-        public string FhirServiceHostName { get; }
-        /// <summary> Id of HL7 FHIR resource. </summary>
-        public string FhirResourceId { get; }
-        /// <summary> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </summary>
-        public long? FhirResourceVersionId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceDeletedEventData.Serialization.cs
deleted file mode 100644
index f51a529553b5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class HealthcareFhirResourceDeletedEventData : IUtf8JsonSerializable, IJsonModel<HealthcareFhirResourceDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<HealthcareFhirResourceDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<HealthcareFhirResourceDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareFhirResourceDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("resourceType"u8);
-            writer.WriteStringValue(FhirResourceType.ToString());
-            if (Optional.IsDefined(FhirServiceHostName))
-            {
-                writer.WritePropertyName("resourceFhirAccount"u8);
-                writer.WriteStringValue(FhirServiceHostName);
-            }
-            if (Optional.IsDefined(FhirResourceId))
-            {
-                writer.WritePropertyName("resourceFhirId"u8);
-                writer.WriteStringValue(FhirResourceId);
-            }
-            if (Optional.IsDefined(FhirResourceVersionId))
-            {
-                writer.WritePropertyName("resourceVersionId"u8);
-                writer.WriteNumberValue(FhirResourceVersionId.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        HealthcareFhirResourceDeletedEventData IJsonModel<HealthcareFhirResourceDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareFhirResourceDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeHealthcareFhirResourceDeletedEventData(document.RootElement, options);
-        }
-
-        internal static HealthcareFhirResourceDeletedEventData DeserializeHealthcareFhirResourceDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            HealthcareFhirResourceType resourceType = default;
-            string resourceFhirAccount = default;
-            string resourceFhirId = default;
-            long? resourceVersionId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceType"u8))
-                {
-                    resourceType = new HealthcareFhirResourceType(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("resourceFhirAccount"u8))
-                {
-                    resourceFhirAccount = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceFhirId"u8))
-                {
-                    resourceFhirId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceVersionId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    resourceVersionId = property.Value.GetInt64();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new HealthcareFhirResourceDeletedEventData(resourceType, resourceFhirAccount, resourceFhirId, resourceVersionId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<HealthcareFhirResourceDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareFhirResourceDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        HealthcareFhirResourceDeletedEventData IPersistableModel<HealthcareFhirResourceDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeHealthcareFhirResourceDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareFhirResourceDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<HealthcareFhirResourceDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static HealthcareFhirResourceDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeHealthcareFhirResourceDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceDeletedEventData.cs
deleted file mode 100644
index 6e883f6f61e4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceDeletedEventData.cs
+++ /dev/null
@@ -1,84 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.FhirResourceDeleted event. </summary>
-    public partial class HealthcareFhirResourceDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceDeletedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        internal HealthcareFhirResourceDeletedEventData(HealthcareFhirResourceType fhirResourceType)
-        {
-            FhirResourceType = fhirResourceType;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceDeletedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        /// <param name="fhirServiceHostName"> Domain name of FHIR account for this resource. </param>
-        /// <param name="fhirResourceId"> Id of HL7 FHIR resource. </param>
-        /// <param name="fhirResourceVersionId"> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal HealthcareFhirResourceDeletedEventData(HealthcareFhirResourceType fhirResourceType, string fhirServiceHostName, string fhirResourceId, long? fhirResourceVersionId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            FhirResourceType = fhirResourceType;
-            FhirServiceHostName = fhirServiceHostName;
-            FhirResourceId = fhirResourceId;
-            FhirResourceVersionId = fhirResourceVersionId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceDeletedEventData"/> for deserialization. </summary>
-        internal HealthcareFhirResourceDeletedEventData()
-        {
-        }
-
-        /// <summary> Type of HL7 FHIR resource. </summary>
-        public HealthcareFhirResourceType FhirResourceType { get; }
-        /// <summary> Domain name of FHIR account for this resource. </summary>
-        public string FhirServiceHostName { get; }
-        /// <summary> Id of HL7 FHIR resource. </summary>
-        public string FhirResourceId { get; }
-        /// <summary> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </summary>
-        public long? FhirResourceVersionId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceType.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceType.cs
deleted file mode 100644
index 895fc9c8b46f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceType.cs
+++ /dev/null
@@ -1,528 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of FHIR resource type enumeration. </summary>
-    public readonly partial struct HealthcareFhirResourceType : IEquatable<HealthcareFhirResourceType>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceType"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public HealthcareFhirResourceType(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string AccountValue = "Account";
-        private const string ActivityDefinitionValue = "ActivityDefinition";
-        private const string AdverseEventValue = "AdverseEvent";
-        private const string AllergyIntoleranceValue = "AllergyIntolerance";
-        private const string AppointmentValue = "Appointment";
-        private const string AppointmentResponseValue = "AppointmentResponse";
-        private const string AuditEventValue = "AuditEvent";
-        private const string BasicValue = "Basic";
-        private const string BinaryValue = "Binary";
-        private const string BiologicallyDerivedProductValue = "BiologicallyDerivedProduct";
-        private const string BodySiteValue = "BodySite";
-        private const string BodyStructureValue = "BodyStructure";
-        private const string BundleValue = "Bundle";
-        private const string CapabilityStatementValue = "CapabilityStatement";
-        private const string CarePlanValue = "CarePlan";
-        private const string CareTeamValue = "CareTeam";
-        private const string CatalogEntryValue = "CatalogEntry";
-        private const string ChargeItemValue = "ChargeItem";
-        private const string ChargeItemDefinitionValue = "ChargeItemDefinition";
-        private const string ClaimValue = "Claim";
-        private const string ClaimResponseValue = "ClaimResponse";
-        private const string ClinicalImpressionValue = "ClinicalImpression";
-        private const string CodeSystemValue = "CodeSystem";
-        private const string CommunicationValue = "Communication";
-        private const string CommunicationRequestValue = "CommunicationRequest";
-        private const string CompartmentDefinitionValue = "CompartmentDefinition";
-        private const string CompositionValue = "Composition";
-        private const string ConceptMapValue = "ConceptMap";
-        private const string ConditionValue = "Condition";
-        private const string ConsentValue = "Consent";
-        private const string ContractValue = "Contract";
-        private const string CoverageValue = "Coverage";
-        private const string CoverageEligibilityRequestValue = "CoverageEligibilityRequest";
-        private const string CoverageEligibilityResponseValue = "CoverageEligibilityResponse";
-        private const string DataElementValue = "DataElement";
-        private const string DetectedIssueValue = "DetectedIssue";
-        private const string DeviceValue = "Device";
-        private const string DeviceComponentValue = "DeviceComponent";
-        private const string DeviceDefinitionValue = "DeviceDefinition";
-        private const string DeviceMetricValue = "DeviceMetric";
-        private const string DeviceRequestValue = "DeviceRequest";
-        private const string DeviceUseStatementValue = "DeviceUseStatement";
-        private const string DiagnosticReportValue = "DiagnosticReport";
-        private const string DocumentManifestValue = "DocumentManifest";
-        private const string DocumentReferenceValue = "DocumentReference";
-        private const string DomainResourceValue = "DomainResource";
-        private const string EffectEvidenceSynthesisValue = "EffectEvidenceSynthesis";
-        private const string EligibilityRequestValue = "EligibilityRequest";
-        private const string EligibilityResponseValue = "EligibilityResponse";
-        private const string EncounterValue = "Encounter";
-        private const string EndpointValue = "Endpoint";
-        private const string EnrollmentRequestValue = "EnrollmentRequest";
-        private const string EnrollmentResponseValue = "EnrollmentResponse";
-        private const string EpisodeOfCareValue = "EpisodeOfCare";
-        private const string EventDefinitionValue = "EventDefinition";
-        private const string EvidenceValue = "Evidence";
-        private const string EvidenceVariableValue = "EvidenceVariable";
-        private const string ExampleScenarioValue = "ExampleScenario";
-        private const string ExpansionProfileValue = "ExpansionProfile";
-        private const string ExplanationOfBenefitValue = "ExplanationOfBenefit";
-        private const string FamilyMemberHistoryValue = "FamilyMemberHistory";
-        private const string FlagValue = "Flag";
-        private const string GoalValue = "Goal";
-        private const string GraphDefinitionValue = "GraphDefinition";
-        private const string GroupValue = "Group";
-        private const string GuidanceResponseValue = "GuidanceResponse";
-        private const string HealthcareServiceValue = "HealthcareService";
-        private const string ImagingManifestValue = "ImagingManifest";
-        private const string ImagingStudyValue = "ImagingStudy";
-        private const string ImmunizationValue = "Immunization";
-        private const string ImmunizationEvaluationValue = "ImmunizationEvaluation";
-        private const string ImmunizationRecommendationValue = "ImmunizationRecommendation";
-        private const string ImplementationGuideValue = "ImplementationGuide";
-        private const string InsurancePlanValue = "InsurancePlan";
-        private const string InvoiceValue = "Invoice";
-        private const string LibraryValue = "Library";
-        private const string LinkageValue = "Linkage";
-        private const string ListValue = "List";
-        private const string LocationValue = "Location";
-        private const string MeasureValue = "Measure";
-        private const string MeasureReportValue = "MeasureReport";
-        private const string MediaValue = "Media";
-        private const string MedicationValue = "Medication";
-        private const string MedicationAdministrationValue = "MedicationAdministration";
-        private const string MedicationDispenseValue = "MedicationDispense";
-        private const string MedicationKnowledgeValue = "MedicationKnowledge";
-        private const string MedicationRequestValue = "MedicationRequest";
-        private const string MedicationStatementValue = "MedicationStatement";
-        private const string MedicinalProductValue = "MedicinalProduct";
-        private const string MedicinalProductAuthorizationValue = "MedicinalProductAuthorization";
-        private const string MedicinalProductContraindicationValue = "MedicinalProductContraindication";
-        private const string MedicinalProductIndicationValue = "MedicinalProductIndication";
-        private const string MedicinalProductIngredientValue = "MedicinalProductIngredient";
-        private const string MedicinalProductInteractionValue = "MedicinalProductInteraction";
-        private const string MedicinalProductManufacturedValue = "MedicinalProductManufactured";
-        private const string MedicinalProductPackagedValue = "MedicinalProductPackaged";
-        private const string MedicinalProductPharmaceuticalValue = "MedicinalProductPharmaceutical";
-        private const string MedicinalProductUndesirableEffectValue = "MedicinalProductUndesirableEffect";
-        private const string MessageDefinitionValue = "MessageDefinition";
-        private const string MessageHeaderValue = "MessageHeader";
-        private const string MolecularSequenceValue = "MolecularSequence";
-        private const string NamingSystemValue = "NamingSystem";
-        private const string NutritionOrderValue = "NutritionOrder";
-        private const string ObservationValue = "Observation";
-        private const string ObservationDefinitionValue = "ObservationDefinition";
-        private const string OperationDefinitionValue = "OperationDefinition";
-        private const string OperationOutcomeValue = "OperationOutcome";
-        private const string OrganizationValue = "Organization";
-        private const string OrganizationAffiliationValue = "OrganizationAffiliation";
-        private const string ParametersValue = "Parameters";
-        private const string PatientValue = "Patient";
-        private const string PaymentNoticeValue = "PaymentNotice";
-        private const string PaymentReconciliationValue = "PaymentReconciliation";
-        private const string PersonValue = "Person";
-        private const string PlanDefinitionValue = "PlanDefinition";
-        private const string PractitionerValue = "Practitioner";
-        private const string PractitionerRoleValue = "PractitionerRole";
-        private const string ProcedureValue = "Procedure";
-        private const string ProcedureRequestValue = "ProcedureRequest";
-        private const string ProcessRequestValue = "ProcessRequest";
-        private const string ProcessResponseValue = "ProcessResponse";
-        private const string ProvenanceValue = "Provenance";
-        private const string QuestionnaireValue = "Questionnaire";
-        private const string QuestionnaireResponseValue = "QuestionnaireResponse";
-        private const string ReferralRequestValue = "ReferralRequest";
-        private const string RelatedPersonValue = "RelatedPerson";
-        private const string RequestGroupValue = "RequestGroup";
-        private const string ResearchDefinitionValue = "ResearchDefinition";
-        private const string ResearchElementDefinitionValue = "ResearchElementDefinition";
-        private const string ResearchStudyValue = "ResearchStudy";
-        private const string ResearchSubjectValue = "ResearchSubject";
-        private const string ResourceValue = "Resource";
-        private const string RiskAssessmentValue = "RiskAssessment";
-        private const string RiskEvidenceSynthesisValue = "RiskEvidenceSynthesis";
-        private const string ScheduleValue = "Schedule";
-        private const string SearchParameterValue = "SearchParameter";
-        private const string SequenceValue = "Sequence";
-        private const string ServiceDefinitionValue = "ServiceDefinition";
-        private const string ServiceRequestValue = "ServiceRequest";
-        private const string SlotValue = "Slot";
-        private const string SpecimenValue = "Specimen";
-        private const string SpecimenDefinitionValue = "SpecimenDefinition";
-        private const string StructureDefinitionValue = "StructureDefinition";
-        private const string StructureMapValue = "StructureMap";
-        private const string SubscriptionValue = "Subscription";
-        private const string SubstanceValue = "Substance";
-        private const string SubstanceNucleicAcidValue = "SubstanceNucleicAcid";
-        private const string SubstancePolymerValue = "SubstancePolymer";
-        private const string SubstanceProteinValue = "SubstanceProtein";
-        private const string SubstanceReferenceInformationValue = "SubstanceReferenceInformation";
-        private const string SubstanceSourceMaterialValue = "SubstanceSourceMaterial";
-        private const string SubstanceSpecificationValue = "SubstanceSpecification";
-        private const string SupplyDeliveryValue = "SupplyDelivery";
-        private const string SupplyRequestValue = "SupplyRequest";
-        private const string TaskValue = "Task";
-        private const string TerminologyCapabilitiesValue = "TerminologyCapabilities";
-        private const string TestReportValue = "TestReport";
-        private const string TestScriptValue = "TestScript";
-        private const string ValueSetValue = "ValueSet";
-        private const string VerificationResultValue = "VerificationResult";
-        private const string VisionPrescriptionValue = "VisionPrescription";
-
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Account { get; } = new HealthcareFhirResourceType(AccountValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ActivityDefinition { get; } = new HealthcareFhirResourceType(ActivityDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType AdverseEvent { get; } = new HealthcareFhirResourceType(AdverseEventValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType AllergyIntolerance { get; } = new HealthcareFhirResourceType(AllergyIntoleranceValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Appointment { get; } = new HealthcareFhirResourceType(AppointmentValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType AppointmentResponse { get; } = new HealthcareFhirResourceType(AppointmentResponseValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType AuditEvent { get; } = new HealthcareFhirResourceType(AuditEventValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Basic { get; } = new HealthcareFhirResourceType(BasicValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Binary { get; } = new HealthcareFhirResourceType(BinaryValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType BiologicallyDerivedProduct { get; } = new HealthcareFhirResourceType(BiologicallyDerivedProductValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType BodySite { get; } = new HealthcareFhirResourceType(BodySiteValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType BodyStructure { get; } = new HealthcareFhirResourceType(BodyStructureValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Bundle { get; } = new HealthcareFhirResourceType(BundleValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType CapabilityStatement { get; } = new HealthcareFhirResourceType(CapabilityStatementValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType CarePlan { get; } = new HealthcareFhirResourceType(CarePlanValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType CareTeam { get; } = new HealthcareFhirResourceType(CareTeamValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType CatalogEntry { get; } = new HealthcareFhirResourceType(CatalogEntryValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ChargeItem { get; } = new HealthcareFhirResourceType(ChargeItemValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType ChargeItemDefinition { get; } = new HealthcareFhirResourceType(ChargeItemDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Claim { get; } = new HealthcareFhirResourceType(ClaimValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ClaimResponse { get; } = new HealthcareFhirResourceType(ClaimResponseValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ClinicalImpression { get; } = new HealthcareFhirResourceType(ClinicalImpressionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType CodeSystem { get; } = new HealthcareFhirResourceType(CodeSystemValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Communication { get; } = new HealthcareFhirResourceType(CommunicationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType CommunicationRequest { get; } = new HealthcareFhirResourceType(CommunicationRequestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType CompartmentDefinition { get; } = new HealthcareFhirResourceType(CompartmentDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Composition { get; } = new HealthcareFhirResourceType(CompositionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ConceptMap { get; } = new HealthcareFhirResourceType(ConceptMapValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Condition { get; } = new HealthcareFhirResourceType(ConditionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Consent { get; } = new HealthcareFhirResourceType(ConsentValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Contract { get; } = new HealthcareFhirResourceType(ContractValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Coverage { get; } = new HealthcareFhirResourceType(CoverageValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType CoverageEligibilityRequest { get; } = new HealthcareFhirResourceType(CoverageEligibilityRequestValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType CoverageEligibilityResponse { get; } = new HealthcareFhirResourceType(CoverageEligibilityResponseValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType DataElement { get; } = new HealthcareFhirResourceType(DataElementValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType DetectedIssue { get; } = new HealthcareFhirResourceType(DetectedIssueValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Device { get; } = new HealthcareFhirResourceType(DeviceValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType DeviceComponent { get; } = new HealthcareFhirResourceType(DeviceComponentValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType DeviceDefinition { get; } = new HealthcareFhirResourceType(DeviceDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType DeviceMetric { get; } = new HealthcareFhirResourceType(DeviceMetricValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType DeviceRequest { get; } = new HealthcareFhirResourceType(DeviceRequestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType DeviceUseStatement { get; } = new HealthcareFhirResourceType(DeviceUseStatementValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType DiagnosticReport { get; } = new HealthcareFhirResourceType(DiagnosticReportValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType DocumentManifest { get; } = new HealthcareFhirResourceType(DocumentManifestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType DocumentReference { get; } = new HealthcareFhirResourceType(DocumentReferenceValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType DomainResource { get; } = new HealthcareFhirResourceType(DomainResourceValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType EffectEvidenceSynthesis { get; } = new HealthcareFhirResourceType(EffectEvidenceSynthesisValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType EligibilityRequest { get; } = new HealthcareFhirResourceType(EligibilityRequestValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType EligibilityResponse { get; } = new HealthcareFhirResourceType(EligibilityResponseValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Encounter { get; } = new HealthcareFhirResourceType(EncounterValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Endpoint { get; } = new HealthcareFhirResourceType(EndpointValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType EnrollmentRequest { get; } = new HealthcareFhirResourceType(EnrollmentRequestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType EnrollmentResponse { get; } = new HealthcareFhirResourceType(EnrollmentResponseValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType EpisodeOfCare { get; } = new HealthcareFhirResourceType(EpisodeOfCareValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType EventDefinition { get; } = new HealthcareFhirResourceType(EventDefinitionValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType Evidence { get; } = new HealthcareFhirResourceType(EvidenceValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType EvidenceVariable { get; } = new HealthcareFhirResourceType(EvidenceVariableValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType ExampleScenario { get; } = new HealthcareFhirResourceType(ExampleScenarioValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType ExpansionProfile { get; } = new HealthcareFhirResourceType(ExpansionProfileValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ExplanationOfBenefit { get; } = new HealthcareFhirResourceType(ExplanationOfBenefitValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType FamilyMemberHistory { get; } = new HealthcareFhirResourceType(FamilyMemberHistoryValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Flag { get; } = new HealthcareFhirResourceType(FlagValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Goal { get; } = new HealthcareFhirResourceType(GoalValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType GraphDefinition { get; } = new HealthcareFhirResourceType(GraphDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Group { get; } = new HealthcareFhirResourceType(GroupValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType GuidanceResponse { get; } = new HealthcareFhirResourceType(GuidanceResponseValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType HealthcareService { get; } = new HealthcareFhirResourceType(HealthcareServiceValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType ImagingManifest { get; } = new HealthcareFhirResourceType(ImagingManifestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ImagingStudy { get; } = new HealthcareFhirResourceType(ImagingStudyValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Immunization { get; } = new HealthcareFhirResourceType(ImmunizationValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType ImmunizationEvaluation { get; } = new HealthcareFhirResourceType(ImmunizationEvaluationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ImmunizationRecommendation { get; } = new HealthcareFhirResourceType(ImmunizationRecommendationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ImplementationGuide { get; } = new HealthcareFhirResourceType(ImplementationGuideValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType InsurancePlan { get; } = new HealthcareFhirResourceType(InsurancePlanValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType Invoice { get; } = new HealthcareFhirResourceType(InvoiceValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Library { get; } = new HealthcareFhirResourceType(LibraryValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Linkage { get; } = new HealthcareFhirResourceType(LinkageValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType List { get; } = new HealthcareFhirResourceType(ListValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Location { get; } = new HealthcareFhirResourceType(LocationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Measure { get; } = new HealthcareFhirResourceType(MeasureValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType MeasureReport { get; } = new HealthcareFhirResourceType(MeasureReportValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Media { get; } = new HealthcareFhirResourceType(MediaValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Medication { get; } = new HealthcareFhirResourceType(MedicationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType MedicationAdministration { get; } = new HealthcareFhirResourceType(MedicationAdministrationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType MedicationDispense { get; } = new HealthcareFhirResourceType(MedicationDispenseValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicationKnowledge { get; } = new HealthcareFhirResourceType(MedicationKnowledgeValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType MedicationRequest { get; } = new HealthcareFhirResourceType(MedicationRequestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType MedicationStatement { get; } = new HealthcareFhirResourceType(MedicationStatementValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProduct { get; } = new HealthcareFhirResourceType(MedicinalProductValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductAuthorization { get; } = new HealthcareFhirResourceType(MedicinalProductAuthorizationValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductContraindication { get; } = new HealthcareFhirResourceType(MedicinalProductContraindicationValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductIndication { get; } = new HealthcareFhirResourceType(MedicinalProductIndicationValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductIngredient { get; } = new HealthcareFhirResourceType(MedicinalProductIngredientValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductInteraction { get; } = new HealthcareFhirResourceType(MedicinalProductInteractionValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductManufactured { get; } = new HealthcareFhirResourceType(MedicinalProductManufacturedValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductPackaged { get; } = new HealthcareFhirResourceType(MedicinalProductPackagedValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductPharmaceutical { get; } = new HealthcareFhirResourceType(MedicinalProductPharmaceuticalValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MedicinalProductUndesirableEffect { get; } = new HealthcareFhirResourceType(MedicinalProductUndesirableEffectValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType MessageDefinition { get; } = new HealthcareFhirResourceType(MessageDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType MessageHeader { get; } = new HealthcareFhirResourceType(MessageHeaderValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType MolecularSequence { get; } = new HealthcareFhirResourceType(MolecularSequenceValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType NamingSystem { get; } = new HealthcareFhirResourceType(NamingSystemValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType NutritionOrder { get; } = new HealthcareFhirResourceType(NutritionOrderValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Observation { get; } = new HealthcareFhirResourceType(ObservationValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType ObservationDefinition { get; } = new HealthcareFhirResourceType(ObservationDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType OperationDefinition { get; } = new HealthcareFhirResourceType(OperationDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType OperationOutcome { get; } = new HealthcareFhirResourceType(OperationOutcomeValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Organization { get; } = new HealthcareFhirResourceType(OrganizationValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType OrganizationAffiliation { get; } = new HealthcareFhirResourceType(OrganizationAffiliationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Parameters { get; } = new HealthcareFhirResourceType(ParametersValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Patient { get; } = new HealthcareFhirResourceType(PatientValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType PaymentNotice { get; } = new HealthcareFhirResourceType(PaymentNoticeValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType PaymentReconciliation { get; } = new HealthcareFhirResourceType(PaymentReconciliationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Person { get; } = new HealthcareFhirResourceType(PersonValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType PlanDefinition { get; } = new HealthcareFhirResourceType(PlanDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Practitioner { get; } = new HealthcareFhirResourceType(PractitionerValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType PractitionerRole { get; } = new HealthcareFhirResourceType(PractitionerRoleValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Procedure { get; } = new HealthcareFhirResourceType(ProcedureValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType ProcedureRequest { get; } = new HealthcareFhirResourceType(ProcedureRequestValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType ProcessRequest { get; } = new HealthcareFhirResourceType(ProcessRequestValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType ProcessResponse { get; } = new HealthcareFhirResourceType(ProcessResponseValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Provenance { get; } = new HealthcareFhirResourceType(ProvenanceValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Questionnaire { get; } = new HealthcareFhirResourceType(QuestionnaireValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType QuestionnaireResponse { get; } = new HealthcareFhirResourceType(QuestionnaireResponseValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType ReferralRequest { get; } = new HealthcareFhirResourceType(ReferralRequestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType RelatedPerson { get; } = new HealthcareFhirResourceType(RelatedPersonValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType RequestGroup { get; } = new HealthcareFhirResourceType(RequestGroupValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType ResearchDefinition { get; } = new HealthcareFhirResourceType(ResearchDefinitionValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType ResearchElementDefinition { get; } = new HealthcareFhirResourceType(ResearchElementDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ResearchStudy { get; } = new HealthcareFhirResourceType(ResearchStudyValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ResearchSubject { get; } = new HealthcareFhirResourceType(ResearchSubjectValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Resource { get; } = new HealthcareFhirResourceType(ResourceValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType RiskAssessment { get; } = new HealthcareFhirResourceType(RiskAssessmentValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType RiskEvidenceSynthesis { get; } = new HealthcareFhirResourceType(RiskEvidenceSynthesisValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Schedule { get; } = new HealthcareFhirResourceType(ScheduleValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType SearchParameter { get; } = new HealthcareFhirResourceType(SearchParameterValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType Sequence { get; } = new HealthcareFhirResourceType(SequenceValue);
-        /// <summary> The FHIR resource type defined in STU3. </summary>
-        public static HealthcareFhirResourceType ServiceDefinition { get; } = new HealthcareFhirResourceType(ServiceDefinitionValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType ServiceRequest { get; } = new HealthcareFhirResourceType(ServiceRequestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Slot { get; } = new HealthcareFhirResourceType(SlotValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Specimen { get; } = new HealthcareFhirResourceType(SpecimenValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType SpecimenDefinition { get; } = new HealthcareFhirResourceType(SpecimenDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType StructureDefinition { get; } = new HealthcareFhirResourceType(StructureDefinitionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType StructureMap { get; } = new HealthcareFhirResourceType(StructureMapValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Subscription { get; } = new HealthcareFhirResourceType(SubscriptionValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Substance { get; } = new HealthcareFhirResourceType(SubstanceValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType SubstanceNucleicAcid { get; } = new HealthcareFhirResourceType(SubstanceNucleicAcidValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType SubstancePolymer { get; } = new HealthcareFhirResourceType(SubstancePolymerValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType SubstanceProtein { get; } = new HealthcareFhirResourceType(SubstanceProteinValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType SubstanceReferenceInformation { get; } = new HealthcareFhirResourceType(SubstanceReferenceInformationValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType SubstanceSourceMaterial { get; } = new HealthcareFhirResourceType(SubstanceSourceMaterialValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType SubstanceSpecification { get; } = new HealthcareFhirResourceType(SubstanceSpecificationValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType SupplyDelivery { get; } = new HealthcareFhirResourceType(SupplyDeliveryValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType SupplyRequest { get; } = new HealthcareFhirResourceType(SupplyRequestValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType Task { get; } = new HealthcareFhirResourceType(TaskValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType TerminologyCapabilities { get; } = new HealthcareFhirResourceType(TerminologyCapabilitiesValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType TestReport { get; } = new HealthcareFhirResourceType(TestReportValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType TestScript { get; } = new HealthcareFhirResourceType(TestScriptValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType ValueSet { get; } = new HealthcareFhirResourceType(ValueSetValue);
-        /// <summary> The FHIR resource type defined in R4. </summary>
-        public static HealthcareFhirResourceType VerificationResult { get; } = new HealthcareFhirResourceType(VerificationResultValue);
-        /// <summary> The FHIR resource type defined in STU3 and R4. </summary>
-        public static HealthcareFhirResourceType VisionPrescription { get; } = new HealthcareFhirResourceType(VisionPrescriptionValue);
-        /// <summary> Determines if two <see cref="HealthcareFhirResourceType"/> values are the same. </summary>
-        public static bool operator ==(HealthcareFhirResourceType left, HealthcareFhirResourceType right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="HealthcareFhirResourceType"/> values are not the same. </summary>
-        public static bool operator !=(HealthcareFhirResourceType left, HealthcareFhirResourceType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="HealthcareFhirResourceType"/>. </summary>
-        public static implicit operator HealthcareFhirResourceType(string value) => new HealthcareFhirResourceType(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is HealthcareFhirResourceType other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(HealthcareFhirResourceType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceUpdatedEventData.Serialization.cs
deleted file mode 100644
index c8002a984a9c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class HealthcareFhirResourceUpdatedEventData : IUtf8JsonSerializable, IJsonModel<HealthcareFhirResourceUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<HealthcareFhirResourceUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<HealthcareFhirResourceUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareFhirResourceUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("resourceType"u8);
-            writer.WriteStringValue(FhirResourceType.ToString());
-            if (Optional.IsDefined(FhirServiceHostName))
-            {
-                writer.WritePropertyName("resourceFhirAccount"u8);
-                writer.WriteStringValue(FhirServiceHostName);
-            }
-            if (Optional.IsDefined(FhirResourceId))
-            {
-                writer.WritePropertyName("resourceFhirId"u8);
-                writer.WriteStringValue(FhirResourceId);
-            }
-            if (Optional.IsDefined(FhirResourceVersionId))
-            {
-                writer.WritePropertyName("resourceVersionId"u8);
-                writer.WriteNumberValue(FhirResourceVersionId.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        HealthcareFhirResourceUpdatedEventData IJsonModel<HealthcareFhirResourceUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(HealthcareFhirResourceUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeHealthcareFhirResourceUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static HealthcareFhirResourceUpdatedEventData DeserializeHealthcareFhirResourceUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            HealthcareFhirResourceType resourceType = default;
-            string resourceFhirAccount = default;
-            string resourceFhirId = default;
-            long? resourceVersionId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceType"u8))
-                {
-                    resourceType = new HealthcareFhirResourceType(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("resourceFhirAccount"u8))
-                {
-                    resourceFhirAccount = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceFhirId"u8))
-                {
-                    resourceFhirId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceVersionId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    resourceVersionId = property.Value.GetInt64();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new HealthcareFhirResourceUpdatedEventData(resourceType, resourceFhirAccount, resourceFhirId, resourceVersionId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<HealthcareFhirResourceUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareFhirResourceUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        HealthcareFhirResourceUpdatedEventData IPersistableModel<HealthcareFhirResourceUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<HealthcareFhirResourceUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeHealthcareFhirResourceUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(HealthcareFhirResourceUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<HealthcareFhirResourceUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static HealthcareFhirResourceUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeHealthcareFhirResourceUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceUpdatedEventData.cs
deleted file mode 100644
index 7133f01a47d2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/HealthcareFhirResourceUpdatedEventData.cs
+++ /dev/null
@@ -1,84 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.HealthcareApis.FhirResourceUpdated event. </summary>
-    public partial class HealthcareFhirResourceUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceUpdatedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        internal HealthcareFhirResourceUpdatedEventData(HealthcareFhirResourceType fhirResourceType)
-        {
-            FhirResourceType = fhirResourceType;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceUpdatedEventData"/>. </summary>
-        /// <param name="fhirResourceType"> Type of HL7 FHIR resource. </param>
-        /// <param name="fhirServiceHostName"> Domain name of FHIR account for this resource. </param>
-        /// <param name="fhirResourceId"> Id of HL7 FHIR resource. </param>
-        /// <param name="fhirResourceVersionId"> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal HealthcareFhirResourceUpdatedEventData(HealthcareFhirResourceType fhirResourceType, string fhirServiceHostName, string fhirResourceId, long? fhirResourceVersionId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            FhirResourceType = fhirResourceType;
-            FhirServiceHostName = fhirServiceHostName;
-            FhirResourceId = fhirResourceId;
-            FhirResourceVersionId = fhirResourceVersionId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="HealthcareFhirResourceUpdatedEventData"/> for deserialization. </summary>
-        internal HealthcareFhirResourceUpdatedEventData()
-        {
-        }
-
-        /// <summary> Type of HL7 FHIR resource. </summary>
-        public HealthcareFhirResourceType FhirResourceType { get; }
-        /// <summary> Domain name of FHIR account for this resource. </summary>
-        public string FhirServiceHostName { get; }
-        /// <summary> Id of HL7 FHIR resource. </summary>
-        public string FhirResourceId { get; }
-        /// <summary> VersionId of HL7 FHIR resource. It changes when the resource is created, updated, or deleted(soft-deletion). </summary>
-        public long? FhirResourceVersionId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ChangeTrackingDictionary.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ChangeTrackingDictionary.cs
deleted file mode 100644
index 89cfa4f97177..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ChangeTrackingDictionary.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    internal class ChangeTrackingDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IReadOnlyDictionary<TKey, TValue> where TKey : notnull
-    {
-        private IDictionary<TKey, TValue> _innerDictionary;
-
-        public ChangeTrackingDictionary()
-        {
-        }
-
-        public ChangeTrackingDictionary(IDictionary<TKey, TValue> dictionary)
-        {
-            if (dictionary == null)
-            {
-                return;
-            }
-            _innerDictionary = new Dictionary<TKey, TValue>(dictionary);
-        }
-
-        public ChangeTrackingDictionary(IReadOnlyDictionary<TKey, TValue> dictionary)
-        {
-            if (dictionary == null)
-            {
-                return;
-            }
-            _innerDictionary = new Dictionary<TKey, TValue>();
-            foreach (var pair in dictionary)
-            {
-                _innerDictionary.Add(pair);
-            }
-        }
-
-        public bool IsUndefined => _innerDictionary == null;
-
-        public int Count => IsUndefined ? 0 : EnsureDictionary().Count;
-
-        public bool IsReadOnly => IsUndefined ? false : EnsureDictionary().IsReadOnly;
-
-        public ICollection<TKey> Keys => IsUndefined ? Array.Empty<TKey>() : EnsureDictionary().Keys;
-
-        public ICollection<TValue> Values => IsUndefined ? Array.Empty<TValue>() : EnsureDictionary().Values;
-
-        public TValue this[TKey key]
-        {
-            get
-            {
-                if (IsUndefined)
-                {
-                    throw new KeyNotFoundException(nameof(key));
-                }
-                return EnsureDictionary()[key];
-            }
-            set
-            {
-                EnsureDictionary()[key] = value;
-            }
-        }
-
-        IEnumerable<TKey> IReadOnlyDictionary<TKey, TValue>.Keys => Keys;
-
-        IEnumerable<TValue> IReadOnlyDictionary<TKey, TValue>.Values => Values;
-
-        public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-        {
-            if (IsUndefined)
-            {
-                IEnumerator<KeyValuePair<TKey, TValue>> enumerateEmpty()
-                {
-                    yield break;
-                }
-                return enumerateEmpty();
-            }
-            return EnsureDictionary().GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public void Add(KeyValuePair<TKey, TValue> item)
-        {
-            EnsureDictionary().Add(item);
-        }
-
-        public void Clear()
-        {
-            EnsureDictionary().Clear();
-        }
-
-        public bool Contains(KeyValuePair<TKey, TValue> item)
-        {
-            if (IsUndefined)
-            {
-                return false;
-            }
-            return EnsureDictionary().Contains(item);
-        }
-
-        public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index)
-        {
-            if (IsUndefined)
-            {
-                return;
-            }
-            EnsureDictionary().CopyTo(array, index);
-        }
-
-        public bool Remove(KeyValuePair<TKey, TValue> item)
-        {
-            if (IsUndefined)
-            {
-                return false;
-            }
-            return EnsureDictionary().Remove(item);
-        }
-
-        public void Add(TKey key, TValue value)
-        {
-            EnsureDictionary().Add(key, value);
-        }
-
-        public bool ContainsKey(TKey key)
-        {
-            if (IsUndefined)
-            {
-                return false;
-            }
-            return EnsureDictionary().ContainsKey(key);
-        }
-
-        public bool Remove(TKey key)
-        {
-            if (IsUndefined)
-            {
-                return false;
-            }
-            return EnsureDictionary().Remove(key);
-        }
-
-        public bool TryGetValue(TKey key, out TValue value)
-        {
-            if (IsUndefined)
-            {
-                value = default;
-                return false;
-            }
-            return EnsureDictionary().TryGetValue(key, out value);
-        }
-
-        public IDictionary<TKey, TValue> EnsureDictionary()
-        {
-            return _innerDictionary ??= new Dictionary<TKey, TValue>();
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ChangeTrackingList.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ChangeTrackingList.cs
deleted file mode 100644
index 08861102824c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ChangeTrackingList.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    internal class ChangeTrackingList<T> : IList<T>, IReadOnlyList<T>
-    {
-        private IList<T> _innerList;
-
-        public ChangeTrackingList()
-        {
-        }
-
-        public ChangeTrackingList(IList<T> innerList)
-        {
-            if (innerList != null)
-            {
-                _innerList = innerList;
-            }
-        }
-
-        public ChangeTrackingList(IReadOnlyList<T> innerList)
-        {
-            if (innerList != null)
-            {
-                _innerList = innerList.ToList();
-            }
-        }
-
-        public bool IsUndefined => _innerList == null;
-
-        public int Count => IsUndefined ? 0 : EnsureList().Count;
-
-        public bool IsReadOnly => IsUndefined ? false : EnsureList().IsReadOnly;
-
-        public T this[int index]
-        {
-            get
-            {
-                if (IsUndefined)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-                return EnsureList()[index];
-            }
-            set
-            {
-                if (IsUndefined)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-                EnsureList()[index] = value;
-            }
-        }
-
-        public void Reset()
-        {
-            _innerList = null;
-        }
-
-        public IEnumerator<T> GetEnumerator()
-        {
-            if (IsUndefined)
-            {
-                IEnumerator<T> enumerateEmpty()
-                {
-                    yield break;
-                }
-                return enumerateEmpty();
-            }
-            return EnsureList().GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public void Add(T item)
-        {
-            EnsureList().Add(item);
-        }
-
-        public void Clear()
-        {
-            EnsureList().Clear();
-        }
-
-        public bool Contains(T item)
-        {
-            if (IsUndefined)
-            {
-                return false;
-            }
-            return EnsureList().Contains(item);
-        }
-
-        public void CopyTo(T[] array, int arrayIndex)
-        {
-            if (IsUndefined)
-            {
-                return;
-            }
-            EnsureList().CopyTo(array, arrayIndex);
-        }
-
-        public bool Remove(T item)
-        {
-            if (IsUndefined)
-            {
-                return false;
-            }
-            return EnsureList().Remove(item);
-        }
-
-        public int IndexOf(T item)
-        {
-            if (IsUndefined)
-            {
-                return -1;
-            }
-            return EnsureList().IndexOf(item);
-        }
-
-        public void Insert(int index, T item)
-        {
-            EnsureList().Insert(index, item);
-        }
-
-        public void RemoveAt(int index)
-        {
-            if (IsUndefined)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-            EnsureList().RemoveAt(index);
-        }
-
-        public IList<T> EnsureList()
-        {
-            return _innerList ??= new List<T>();
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ModelSerializationExtensions.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ModelSerializationExtensions.cs
deleted file mode 100644
index 5c826bd5ab24..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/ModelSerializationExtensions.cs
+++ /dev/null
@@ -1,398 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text.Json;
-using System.Xml;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    internal static class ModelSerializationExtensions
-    {
-        internal static readonly ModelReaderWriterOptions WireOptions = new ModelReaderWriterOptions("W");
-
-        public static object GetObject(this JsonElement element)
-        {
-            switch (element.ValueKind)
-            {
-                case JsonValueKind.String:
-                    return element.GetString();
-                case JsonValueKind.Number:
-                    if (element.TryGetInt32(out int intValue))
-                    {
-                        return intValue;
-                    }
-                    if (element.TryGetInt64(out long longValue))
-                    {
-                        return longValue;
-                    }
-                    return element.GetDouble();
-                case JsonValueKind.True:
-                    return true;
-                case JsonValueKind.False:
-                    return false;
-                case JsonValueKind.Undefined:
-                case JsonValueKind.Null:
-                    return null;
-                case JsonValueKind.Object:
-                    var dictionary = new Dictionary<string, object>();
-                    foreach (var jsonProperty in element.EnumerateObject())
-                    {
-                        dictionary.Add(jsonProperty.Name, jsonProperty.Value.GetObject());
-                    }
-                    return dictionary;
-                case JsonValueKind.Array:
-                    var list = new List<object>();
-                    foreach (var item in element.EnumerateArray())
-                    {
-                        list.Add(item.GetObject());
-                    }
-                    return list.ToArray();
-                default:
-                    throw new NotSupportedException($"Not supported value kind {element.ValueKind}");
-            }
-        }
-
-        public static byte[] GetBytesFromBase64(this JsonElement element, string format)
-        {
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-
-            return format switch
-            {
-                "U" => TypeFormatters.FromBase64UrlString(element.GetRequiredString()),
-                "D" => element.GetBytesFromBase64(),
-                _ => throw new ArgumentException($"Format is not supported: '{format}'", nameof(format))
-            };
-        }
-
-        public static DateTimeOffset GetDateTimeOffset(this JsonElement element, string format) => format switch
-        {
-            "U" when element.ValueKind == JsonValueKind.Number => DateTimeOffset.FromUnixTimeSeconds(element.GetInt64()),
-            _ => TypeFormatters.ParseDateTimeOffset(element.GetString(), format)
-        };
-
-        public static TimeSpan GetTimeSpan(this JsonElement element, string format) => TypeFormatters.ParseTimeSpan(element.GetString(), format);
-
-        public static char GetChar(this JsonElement element)
-        {
-            if (element.ValueKind == JsonValueKind.String)
-            {
-                var text = element.GetString();
-                if (text == null || text.Length != 1)
-                {
-                    throw new NotSupportedException($"Cannot convert \"{text}\" to a char");
-                }
-                return text[0];
-            }
-            else
-            {
-                throw new NotSupportedException($"Cannot convert {element.ValueKind} to a char");
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void ThrowNonNullablePropertyIsNull(this JsonProperty property)
-        {
-            throw new JsonException($"A property '{property.Name}' defined as non-nullable but received as null from the service. This exception only happens in DEBUG builds of the library and would be ignored in the release build");
-        }
-
-        public static string GetRequiredString(this JsonElement element)
-        {
-            var value = element.GetString();
-            if (value == null)
-            {
-                throw new InvalidOperationException($"The requested operation requires an element of type 'String', but the target element has type '{element.ValueKind}'.");
-            }
-            return value;
-        }
-
-        public static void WriteStringValue(this Utf8JsonWriter writer, DateTimeOffset value, string format)
-        {
-            writer.WriteStringValue(TypeFormatters.ToString(value, format));
-        }
-
-        public static void WriteStringValue(this Utf8JsonWriter writer, DateTime value, string format)
-        {
-            writer.WriteStringValue(TypeFormatters.ToString(value, format));
-        }
-
-        public static void WriteStringValue(this Utf8JsonWriter writer, TimeSpan value, string format)
-        {
-            writer.WriteStringValue(TypeFormatters.ToString(value, format));
-        }
-
-        public static void WriteStringValue(this Utf8JsonWriter writer, char value)
-        {
-            writer.WriteStringValue(value.ToString(CultureInfo.InvariantCulture));
-        }
-
-        public static void WriteBase64StringValue(this Utf8JsonWriter writer, byte[] value, string format)
-        {
-            if (value == null)
-            {
-                writer.WriteNullValue();
-                return;
-            }
-            switch (format)
-            {
-                case "U":
-                    writer.WriteStringValue(TypeFormatters.ToBase64UrlString(value));
-                    break;
-                case "D":
-                    writer.WriteBase64StringValue(value);
-                    break;
-                default:
-                    throw new ArgumentException($"Format is not supported: '{format}'", nameof(format));
-            }
-        }
-
-        public static void WriteNumberValue(this Utf8JsonWriter writer, DateTimeOffset value, string format)
-        {
-            if (format != "U")
-            {
-                throw new ArgumentOutOfRangeException(nameof(format), "Only 'U' format is supported when writing a DateTimeOffset as a Number.");
-            }
-            writer.WriteNumberValue(value.ToUnixTimeSeconds());
-        }
-
-        public static void WriteObjectValue<T>(this Utf8JsonWriter writer, T value, ModelReaderWriterOptions options = null)
-        {
-            switch (value)
-            {
-                case null:
-                    writer.WriteNullValue();
-                    break;
-                case IJsonModel<T> jsonModel:
-                    jsonModel.Write(writer, options ?? WireOptions);
-                    break;
-                case IUtf8JsonSerializable serializable:
-                    serializable.Write(writer);
-                    break;
-                case byte[] bytes:
-                    writer.WriteBase64StringValue(bytes);
-                    break;
-                case BinaryData bytes0:
-                    writer.WriteBase64StringValue(bytes0);
-                    break;
-                case JsonElement json:
-                    json.WriteTo(writer);
-                    break;
-                case int i:
-                    writer.WriteNumberValue(i);
-                    break;
-                case decimal d:
-                    writer.WriteNumberValue(d);
-                    break;
-                case double d0:
-                    if (double.IsNaN(d0))
-                    {
-                        writer.WriteStringValue("NaN");
-                    }
-                    else
-                    {
-                        writer.WriteNumberValue(d0);
-                    }
-                    break;
-                case float f:
-                    writer.WriteNumberValue(f);
-                    break;
-                case long l:
-                    writer.WriteNumberValue(l);
-                    break;
-                case string s:
-                    writer.WriteStringValue(s);
-                    break;
-                case bool b:
-                    writer.WriteBooleanValue(b);
-                    break;
-                case Guid g:
-                    writer.WriteStringValue(g);
-                    break;
-                case DateTimeOffset dateTimeOffset:
-                    writer.WriteStringValue(dateTimeOffset, "O");
-                    break;
-                case DateTime dateTime:
-                    writer.WriteStringValue(dateTime, "O");
-                    break;
-                case IEnumerable<KeyValuePair<string, object>> enumerable:
-                    writer.WriteStartObject();
-                    foreach (var pair in enumerable)
-                    {
-                        writer.WritePropertyName(pair.Key);
-                        writer.WriteObjectValue<object>(pair.Value, options);
-                    }
-                    writer.WriteEndObject();
-                    break;
-                case IEnumerable<object> objectEnumerable:
-                    writer.WriteStartArray();
-                    foreach (var item in objectEnumerable)
-                    {
-                        writer.WriteObjectValue<object>(item, options);
-                    }
-                    writer.WriteEndArray();
-                    break;
-                case TimeSpan timeSpan:
-                    writer.WriteStringValue(timeSpan, "P");
-                    break;
-                default:
-                    throw new NotSupportedException($"Not supported type {value.GetType()}");
-            }
-        }
-
-        public static void WriteObjectValue(this Utf8JsonWriter writer, object value, ModelReaderWriterOptions options = null)
-        {
-            writer.WriteObjectValue<object>(value, options);
-        }
-
-        internal static class TypeFormatters
-        {
-            private const string RoundtripZFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";
-            public const string DefaultNumberFormat = "G";
-
-            public static string ToString(bool value) => value ? "true" : "false";
-
-            public static string ToString(DateTime value, string format) => value.Kind switch
-            {
-                DateTimeKind.Utc => ToString((DateTimeOffset)value, format),
-                _ => throw new NotSupportedException($"DateTime {value} has a Kind of {value.Kind}. Azure SDK requires it to be UTC. You can call DateTime.SpecifyKind to change Kind property value to DateTimeKind.Utc.")
-            };
-
-            public static string ToString(DateTimeOffset value, string format) => format switch
-            {
-                "D" => value.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
-                "U" => value.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture),
-                "O" => value.ToUniversalTime().ToString(RoundtripZFormat, CultureInfo.InvariantCulture),
-                "o" => value.ToUniversalTime().ToString(RoundtripZFormat, CultureInfo.InvariantCulture),
-                "R" => value.ToString("r", CultureInfo.InvariantCulture),
-                _ => value.ToString(format, CultureInfo.InvariantCulture)
-            };
-
-            public static string ToString(TimeSpan value, string format) => format switch
-            {
-                "P" => XmlConvert.ToString(value),
-                _ => value.ToString(format, CultureInfo.InvariantCulture)
-            };
-
-            public static string ToString(byte[] value, string format) => format switch
-            {
-                "U" => ToBase64UrlString(value),
-                "D" => Convert.ToBase64String(value),
-                _ => throw new ArgumentException($"Format is not supported: '{format}'", nameof(format))
-            };
-
-            public static string ToBase64UrlString(byte[] value)
-            {
-                int numWholeOrPartialInputBlocks = checked(value.Length + 2) / 3;
-                int size = checked(numWholeOrPartialInputBlocks * 4);
-                char[] output = new char[size];
-
-                int numBase64Chars = Convert.ToBase64CharArray(value, 0, value.Length, output, 0);
-
-                int i = 0;
-                for (; i < numBase64Chars; i++)
-                {
-                    char ch = output[i];
-                    if (ch == '+')
-                    {
-                        output[i] = '-';
-                    }
-                    else
-                    {
-                        if (ch == '/')
-                        {
-                            output[i] = '_';
-                        }
-                        else
-                        {
-                            if (ch == '=')
-                            {
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                return new string(output, 0, i);
-            }
-
-            public static byte[] FromBase64UrlString(string value)
-            {
-                int paddingCharsToAdd = (value.Length % 4) switch
-                {
-                    0 => 0,
-                    2 => 2,
-                    3 => 1,
-                    _ => throw new InvalidOperationException("Malformed input")
-                };
-                char[] output = new char[(value.Length + paddingCharsToAdd)];
-                int i = 0;
-                for (; i < value.Length; i++)
-                {
-                    char ch = value[i];
-                    if (ch == '-')
-                    {
-                        output[i] = '+';
-                    }
-                    else
-                    {
-                        if (ch == '_')
-                        {
-                            output[i] = '/';
-                        }
-                        else
-                        {
-                            output[i] = ch;
-                        }
-                    }
-                }
-
-                for (; i < output.Length; i++)
-                {
-                    output[i] = '=';
-                }
-
-                return Convert.FromBase64CharArray(output, 0, output.Length);
-            }
-
-            public static DateTimeOffset ParseDateTimeOffset(string value, string format) => format switch
-            {
-                "U" => DateTimeOffset.FromUnixTimeSeconds(long.Parse(value, CultureInfo.InvariantCulture)),
-                _ => DateTimeOffset.Parse(value, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal)
-            };
-
-            public static TimeSpan ParseTimeSpan(string value, string format) => format switch
-            {
-                "P" => XmlConvert.ToTimeSpan(value),
-                _ => TimeSpan.ParseExact(value, format, CultureInfo.InvariantCulture)
-            };
-
-            public static string ConvertToString(object value, string format = null) => value switch
-            {
-                null => "null",
-                string s => s,
-                bool b => ToString(b),
-                int or float or double or long or decimal => ((IFormattable)value).ToString(DefaultNumberFormat, CultureInfo.InvariantCulture),
-                byte[] b0 when format != null => ToString(b0, format),
-                IEnumerable<string> s0 => string.Join(",", s0),
-                DateTimeOffset dateTime when format != null => ToString(dateTime, format),
-                TimeSpan timeSpan when format != null => ToString(timeSpan, format),
-                TimeSpan timeSpan0 => XmlConvert.ToString(timeSpan0),
-                Guid guid => guid.ToString(),
-                BinaryData binaryData => ConvertToString(binaryData.ToArray(), format),
-                _ => value.ToString()
-            };
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/Optional.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/Optional.cs
deleted file mode 100644
index 0c812e3a4640..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/Optional.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    internal static class Optional
-    {
-        public static bool IsCollectionDefined<T>(IEnumerable<T> collection)
-        {
-            return !(collection is ChangeTrackingList<T> changeTrackingList && changeTrackingList.IsUndefined);
-        }
-
-        public static bool IsCollectionDefined<TKey, TValue>(IDictionary<TKey, TValue> collection)
-        {
-            return !(collection is ChangeTrackingDictionary<TKey, TValue> changeTrackingDictionary && changeTrackingDictionary.IsUndefined);
-        }
-
-        public static bool IsCollectionDefined<TKey, TValue>(IReadOnlyDictionary<TKey, TValue> collection)
-        {
-            return !(collection is ChangeTrackingDictionary<TKey, TValue> changeTrackingDictionary && changeTrackingDictionary.IsUndefined);
-        }
-
-        public static bool IsDefined<T>(T? value)
-        where T : struct
-        {
-            return value.HasValue;
-        }
-
-        public static bool IsDefined(object value)
-        {
-            return value != null;
-        }
-
-        public static bool IsDefined(JsonElement value)
-        {
-            return value.ValueKind != JsonValueKind.Undefined;
-        }
-
-        public static bool IsDefined(string value)
-        {
-            return value != null;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/Utf8JsonRequestContent.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/Utf8JsonRequestContent.cs
deleted file mode 100644
index 94cc4cc536d5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/Internal/Utf8JsonRequestContent.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System.IO;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    internal class Utf8JsonRequestContent : RequestContent
-    {
-        private readonly MemoryStream _stream;
-        private readonly RequestContent _content;
-
-        public Utf8JsonRequestContent()
-        {
-            _stream = new MemoryStream();
-            _content = Create(_stream);
-            JsonWriter = new Utf8JsonWriter(_stream);
-        }
-
-        public Utf8JsonWriter JsonWriter { get; }
-
-        public override async Task WriteToAsync(Stream stream, CancellationToken cancellationToken = default)
-        {
-            await JsonWriter.FlushAsync().ConfigureAwait(false);
-            await _content.WriteToAsync(stream, cancellationToken).ConfigureAwait(false);
-        }
-
-        public override void WriteTo(Stream stream, CancellationToken cancellationToken = default)
-        {
-            JsonWriter.Flush();
-            _content.WriteTo(stream, cancellationToken);
-        }
-
-        public override bool TryComputeLength(out long length)
-        {
-            length = JsonWriter.BytesCommitted + JsonWriter.BytesPending;
-            return true;
-        }
-
-        public override void Dispose()
-        {
-            JsonWriter.Dispose();
-            _content.Dispose();
-            _stream.Dispose();
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceConnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceConnectedEventData.Serialization.cs
deleted file mode 100644
index 0cde2d5698c8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceConnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class IotHubDeviceConnectedEventData : IUtf8JsonSerializable, IJsonModel<IotHubDeviceConnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<IotHubDeviceConnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<IotHubDeviceConnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceConnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        IotHubDeviceConnectedEventData IJsonModel<IotHubDeviceConnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceConnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeIotHubDeviceConnectedEventData(document.RootElement, options);
-        }
-
-        internal static IotHubDeviceConnectedEventData DeserializeIotHubDeviceConnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deviceId = default;
-            string moduleId = default;
-            string hubName = default;
-            DeviceConnectionStateEventInfo deviceConnectionStateEventInfo = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deviceId"u8))
-                {
-                    deviceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("moduleId"u8))
-                {
-                    moduleId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("hubName"u8))
-                {
-                    hubName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("deviceConnectionStateEventInfo"u8))
-                {
-                    deviceConnectionStateEventInfo = DeviceConnectionStateEventInfo.DeserializeDeviceConnectionStateEventInfo(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new IotHubDeviceConnectedEventData(deviceId, moduleId, hubName, deviceConnectionStateEventInfo, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<IotHubDeviceConnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceConnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        IotHubDeviceConnectedEventData IPersistableModel<IotHubDeviceConnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeIotHubDeviceConnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceConnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<IotHubDeviceConnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new IotHubDeviceConnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeIotHubDeviceConnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceConnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceConnectedEventData.cs
deleted file mode 100644
index bab1f7fd67b6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceConnectedEventData.cs
+++ /dev/null
@@ -1,39 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.Devices.DeviceConnected event. </summary>
-    public partial class IotHubDeviceConnectedEventData : DeviceConnectionStateEventProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceConnectedEventData"/>. </summary>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="deviceConnectionStateEventInfo"/> is null. </exception>
-        internal IotHubDeviceConnectedEventData(DeviceConnectionStateEventInfo deviceConnectionStateEventInfo) : base(deviceConnectionStateEventInfo)
-        {
-            Argument.AssertNotNull(deviceConnectionStateEventInfo, nameof(deviceConnectionStateEventInfo));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceConnectedEventData"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="moduleId"> The unique identifier of the module. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal IotHubDeviceConnectedEventData(string deviceId, string moduleId, string hubName, DeviceConnectionStateEventInfo deviceConnectionStateEventInfo, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(deviceId, moduleId, hubName, deviceConnectionStateEventInfo, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceConnectedEventData"/> for deserialization. </summary>
-        internal IotHubDeviceConnectedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceCreatedEventData.Serialization.cs
deleted file mode 100644
index 119996600f1b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class IotHubDeviceCreatedEventData : IUtf8JsonSerializable, IJsonModel<IotHubDeviceCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<IotHubDeviceCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<IotHubDeviceCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        IotHubDeviceCreatedEventData IJsonModel<IotHubDeviceCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeIotHubDeviceCreatedEventData(document.RootElement, options);
-        }
-
-        internal static IotHubDeviceCreatedEventData DeserializeIotHubDeviceCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deviceId = default;
-            string hubName = default;
-            DeviceTwinInfo twin = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deviceId"u8))
-                {
-                    deviceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("hubName"u8))
-                {
-                    hubName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("twin"u8))
-                {
-                    twin = DeviceTwinInfo.DeserializeDeviceTwinInfo(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new IotHubDeviceCreatedEventData(deviceId, hubName, twin, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<IotHubDeviceCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        IotHubDeviceCreatedEventData IPersistableModel<IotHubDeviceCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeIotHubDeviceCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<IotHubDeviceCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new IotHubDeviceCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeIotHubDeviceCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceCreatedEventData.cs
deleted file mode 100644
index 6fff044ca2cd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceCreatedEventData.cs
+++ /dev/null
@@ -1,38 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.Devices.DeviceCreated event. </summary>
-    public partial class IotHubDeviceCreatedEventData : DeviceLifeCycleEventProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceCreatedEventData"/>. </summary>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="twin"/> is null. </exception>
-        internal IotHubDeviceCreatedEventData(DeviceTwinInfo twin) : base(twin)
-        {
-            Argument.AssertNotNull(twin, nameof(twin));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceCreatedEventData"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal IotHubDeviceCreatedEventData(string deviceId, string hubName, DeviceTwinInfo twin, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(deviceId, hubName, twin, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceCreatedEventData"/> for deserialization. </summary>
-        internal IotHubDeviceCreatedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDeletedEventData.Serialization.cs
deleted file mode 100644
index 14432f7ca5dd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class IotHubDeviceDeletedEventData : IUtf8JsonSerializable, IJsonModel<IotHubDeviceDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<IotHubDeviceDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<IotHubDeviceDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        IotHubDeviceDeletedEventData IJsonModel<IotHubDeviceDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeIotHubDeviceDeletedEventData(document.RootElement, options);
-        }
-
-        internal static IotHubDeviceDeletedEventData DeserializeIotHubDeviceDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deviceId = default;
-            string hubName = default;
-            DeviceTwinInfo twin = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deviceId"u8))
-                {
-                    deviceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("hubName"u8))
-                {
-                    hubName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("twin"u8))
-                {
-                    twin = DeviceTwinInfo.DeserializeDeviceTwinInfo(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new IotHubDeviceDeletedEventData(deviceId, hubName, twin, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<IotHubDeviceDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        IotHubDeviceDeletedEventData IPersistableModel<IotHubDeviceDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeIotHubDeviceDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<IotHubDeviceDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new IotHubDeviceDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeIotHubDeviceDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDeletedEventData.cs
deleted file mode 100644
index 3bc2d22cdc0e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDeletedEventData.cs
+++ /dev/null
@@ -1,38 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.Devices.DeviceDeleted event. </summary>
-    public partial class IotHubDeviceDeletedEventData : DeviceLifeCycleEventProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceDeletedEventData"/>. </summary>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="twin"/> is null. </exception>
-        internal IotHubDeviceDeletedEventData(DeviceTwinInfo twin) : base(twin)
-        {
-            Argument.AssertNotNull(twin, nameof(twin));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceDeletedEventData"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="twin"> Information about the device twin, which is the cloud representation of application device metadata. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal IotHubDeviceDeletedEventData(string deviceId, string hubName, DeviceTwinInfo twin, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(deviceId, hubName, twin, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceDeletedEventData"/> for deserialization. </summary>
-        internal IotHubDeviceDeletedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDisconnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDisconnectedEventData.Serialization.cs
deleted file mode 100644
index 2c2e9879f65f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDisconnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class IotHubDeviceDisconnectedEventData : IUtf8JsonSerializable, IJsonModel<IotHubDeviceDisconnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<IotHubDeviceDisconnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<IotHubDeviceDisconnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceDisconnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        IotHubDeviceDisconnectedEventData IJsonModel<IotHubDeviceDisconnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceDisconnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeIotHubDeviceDisconnectedEventData(document.RootElement, options);
-        }
-
-        internal static IotHubDeviceDisconnectedEventData DeserializeIotHubDeviceDisconnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deviceId = default;
-            string moduleId = default;
-            string hubName = default;
-            DeviceConnectionStateEventInfo deviceConnectionStateEventInfo = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deviceId"u8))
-                {
-                    deviceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("moduleId"u8))
-                {
-                    moduleId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("hubName"u8))
-                {
-                    hubName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("deviceConnectionStateEventInfo"u8))
-                {
-                    deviceConnectionStateEventInfo = DeviceConnectionStateEventInfo.DeserializeDeviceConnectionStateEventInfo(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new IotHubDeviceDisconnectedEventData(deviceId, moduleId, hubName, deviceConnectionStateEventInfo, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<IotHubDeviceDisconnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceDisconnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        IotHubDeviceDisconnectedEventData IPersistableModel<IotHubDeviceDisconnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeIotHubDeviceDisconnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceDisconnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<IotHubDeviceDisconnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new IotHubDeviceDisconnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeIotHubDeviceDisconnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDisconnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDisconnectedEventData.cs
deleted file mode 100644
index 3d5cbc20be6d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceDisconnectedEventData.cs
+++ /dev/null
@@ -1,39 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.Devices.DeviceDisconnected event. </summary>
-    public partial class IotHubDeviceDisconnectedEventData : DeviceConnectionStateEventProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceDisconnectedEventData"/>. </summary>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="deviceConnectionStateEventInfo"/> is null. </exception>
-        internal IotHubDeviceDisconnectedEventData(DeviceConnectionStateEventInfo deviceConnectionStateEventInfo) : base(deviceConnectionStateEventInfo)
-        {
-            Argument.AssertNotNull(deviceConnectionStateEventInfo, nameof(deviceConnectionStateEventInfo));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceDisconnectedEventData"/>. </summary>
-        /// <param name="deviceId"> The unique identifier of the device. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="moduleId"> The unique identifier of the module. This case-sensitive string can be up to 128 characters long, and supports ASCII 7-bit alphanumeric characters plus the following special characters: - : . + % _ &amp;#35; * ? ! ( ) , = `@` ; $ '. </param>
-        /// <param name="hubName"> Name of the IoT Hub where the device was created or deleted. </param>
-        /// <param name="deviceConnectionStateEventInfo"> Information about the device connection state event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal IotHubDeviceDisconnectedEventData(string deviceId, string moduleId, string hubName, DeviceConnectionStateEventInfo deviceConnectionStateEventInfo, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(deviceId, moduleId, hubName, deviceConnectionStateEventInfo, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceDisconnectedEventData"/> for deserialization. </summary>
-        internal IotHubDeviceDisconnectedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceTelemetryEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceTelemetryEventData.Serialization.cs
deleted file mode 100644
index c58260903dc9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceTelemetryEventData.Serialization.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class IotHubDeviceTelemetryEventData : IUtf8JsonSerializable, IJsonModel<IotHubDeviceTelemetryEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<IotHubDeviceTelemetryEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<IotHubDeviceTelemetryEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceTelemetryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceTelemetryEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        IotHubDeviceTelemetryEventData IJsonModel<IotHubDeviceTelemetryEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceTelemetryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(IotHubDeviceTelemetryEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeIotHubDeviceTelemetryEventData(document.RootElement, options);
-        }
-
-        internal static IotHubDeviceTelemetryEventData DeserializeIotHubDeviceTelemetryEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyDictionary<string, BinaryData> body = default;
-            IReadOnlyDictionary<string, string> properties = default;
-            IReadOnlyDictionary<string, string> systemProperties = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("body"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    body = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    properties = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("systemProperties"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    systemProperties = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new IotHubDeviceTelemetryEventData(body, properties, systemProperties, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<IotHubDeviceTelemetryEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceTelemetryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceTelemetryEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        IotHubDeviceTelemetryEventData IPersistableModel<IotHubDeviceTelemetryEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<IotHubDeviceTelemetryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeIotHubDeviceTelemetryEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(IotHubDeviceTelemetryEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<IotHubDeviceTelemetryEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new IotHubDeviceTelemetryEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeIotHubDeviceTelemetryEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceTelemetryEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceTelemetryEventData.cs
deleted file mode 100644
index f269b3b95bfa..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/IotHubDeviceTelemetryEventData.cs
+++ /dev/null
@@ -1,42 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Event data for Microsoft.Devices.DeviceTelemetry event. </summary>
-    public partial class IotHubDeviceTelemetryEventData : DeviceTelemetryEventProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceTelemetryEventData"/>. </summary>
-        /// <param name="body"> The content of the message from the device. </param>
-        /// <param name="properties"> Application properties are user-defined strings that can be added to the message. These fields are optional. </param>
-        /// <param name="systemProperties"> System properties help identify contents and source of the messages. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="body"/>, <paramref name="properties"/> or <paramref name="systemProperties"/> is null. </exception>
-        internal IotHubDeviceTelemetryEventData(IReadOnlyDictionary<string, BinaryData> body, IReadOnlyDictionary<string, string> properties, IReadOnlyDictionary<string, string> systemProperties) : base(body, properties, systemProperties)
-        {
-            Argument.AssertNotNull(body, nameof(body));
-            Argument.AssertNotNull(properties, nameof(properties));
-            Argument.AssertNotNull(systemProperties, nameof(systemProperties));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceTelemetryEventData"/>. </summary>
-        /// <param name="body"> The content of the message from the device. </param>
-        /// <param name="properties"> Application properties are user-defined strings that can be added to the message. These fields are optional. </param>
-        /// <param name="systemProperties"> System properties help identify contents and source of the messages. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal IotHubDeviceTelemetryEventData(IReadOnlyDictionary<string, BinaryData> body, IReadOnlyDictionary<string, string> properties, IReadOnlyDictionary<string, string> systemProperties, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(body, properties, systemProperties, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="IotHubDeviceTelemetryEventData"/> for deserialization. </summary>
-        internal IotHubDeviceTelemetryEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultAccessPolicyChangedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultAccessPolicyChangedEventData.Serialization.cs
deleted file mode 100644
index 1889a7a88d95..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultAccessPolicyChangedEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultAccessPolicyChangedEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultAccessPolicyChangedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultAccessPolicyChangedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultAccessPolicyChangedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultAccessPolicyChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultAccessPolicyChangedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultAccessPolicyChangedEventData IJsonModel<KeyVaultAccessPolicyChangedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultAccessPolicyChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultAccessPolicyChangedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultAccessPolicyChangedEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultAccessPolicyChangedEventData DeserializeKeyVaultAccessPolicyChangedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultAccessPolicyChangedEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultAccessPolicyChangedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultAccessPolicyChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultAccessPolicyChangedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultAccessPolicyChangedEventData IPersistableModel<KeyVaultAccessPolicyChangedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultAccessPolicyChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultAccessPolicyChangedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultAccessPolicyChangedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultAccessPolicyChangedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultAccessPolicyChangedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultAccessPolicyChangedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultAccessPolicyChangedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultAccessPolicyChangedEventData.cs
deleted file mode 100644
index 98eb5f13d699..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultAccessPolicyChangedEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.VaultAccessPolicyChanged event. </summary>
-    public partial class KeyVaultAccessPolicyChangedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultAccessPolicyChangedEventData"/>. </summary>
-        internal KeyVaultAccessPolicyChangedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultAccessPolicyChangedEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultAccessPolicyChangedEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateExpiredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateExpiredEventData.Serialization.cs
deleted file mode 100644
index 97133d32eff4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateExpiredEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultCertificateExpiredEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultCertificateExpiredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultCertificateExpiredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultCertificateExpiredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultCertificateExpiredEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultCertificateExpiredEventData IJsonModel<KeyVaultCertificateExpiredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultCertificateExpiredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultCertificateExpiredEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultCertificateExpiredEventData DeserializeKeyVaultCertificateExpiredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultCertificateExpiredEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultCertificateExpiredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultCertificateExpiredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultCertificateExpiredEventData IPersistableModel<KeyVaultCertificateExpiredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultCertificateExpiredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultCertificateExpiredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultCertificateExpiredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultCertificateExpiredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultCertificateExpiredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateExpiredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateExpiredEventData.cs
deleted file mode 100644
index c210c2b0a99a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateExpiredEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.CertificateExpired event. </summary>
-    public partial class KeyVaultCertificateExpiredEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultCertificateExpiredEventData"/>. </summary>
-        internal KeyVaultCertificateExpiredEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultCertificateExpiredEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultCertificateExpiredEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNearExpiryEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNearExpiryEventData.Serialization.cs
deleted file mode 100644
index 93bdba22a7c9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNearExpiryEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultCertificateNearExpiryEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultCertificateNearExpiryEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultCertificateNearExpiryEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultCertificateNearExpiryEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultCertificateNearExpiryEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultCertificateNearExpiryEventData IJsonModel<KeyVaultCertificateNearExpiryEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultCertificateNearExpiryEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultCertificateNearExpiryEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultCertificateNearExpiryEventData DeserializeKeyVaultCertificateNearExpiryEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultCertificateNearExpiryEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultCertificateNearExpiryEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultCertificateNearExpiryEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultCertificateNearExpiryEventData IPersistableModel<KeyVaultCertificateNearExpiryEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultCertificateNearExpiryEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultCertificateNearExpiryEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultCertificateNearExpiryEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultCertificateNearExpiryEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultCertificateNearExpiryEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNearExpiryEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNearExpiryEventData.cs
deleted file mode 100644
index 149ea3648db0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNearExpiryEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.CertificateNearExpiry event. </summary>
-    public partial class KeyVaultCertificateNearExpiryEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultCertificateNearExpiryEventData"/>. </summary>
-        internal KeyVaultCertificateNearExpiryEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultCertificateNearExpiryEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultCertificateNearExpiryEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNewVersionCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNewVersionCreatedEventData.Serialization.cs
deleted file mode 100644
index 20a19baa3ea8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNewVersionCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultCertificateNewVersionCreatedEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultCertificateNewVersionCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultCertificateNewVersionCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultCertificateNewVersionCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultCertificateNewVersionCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultCertificateNewVersionCreatedEventData IJsonModel<KeyVaultCertificateNewVersionCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultCertificateNewVersionCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultCertificateNewVersionCreatedEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultCertificateNewVersionCreatedEventData DeserializeKeyVaultCertificateNewVersionCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultCertificateNewVersionCreatedEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultCertificateNewVersionCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultCertificateNewVersionCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultCertificateNewVersionCreatedEventData IPersistableModel<KeyVaultCertificateNewVersionCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultCertificateNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultCertificateNewVersionCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultCertificateNewVersionCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultCertificateNewVersionCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultCertificateNewVersionCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultCertificateNewVersionCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNewVersionCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNewVersionCreatedEventData.cs
deleted file mode 100644
index 317264ad4e2e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultCertificateNewVersionCreatedEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.CertificateNewVersionCreated event. </summary>
-    public partial class KeyVaultCertificateNewVersionCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultCertificateNewVersionCreatedEventData"/>. </summary>
-        internal KeyVaultCertificateNewVersionCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultCertificateNewVersionCreatedEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultCertificateNewVersionCreatedEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyExpiredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyExpiredEventData.Serialization.cs
deleted file mode 100644
index f3399ac7eb99..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyExpiredEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultKeyExpiredEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultKeyExpiredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultKeyExpiredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultKeyExpiredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultKeyExpiredEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultKeyExpiredEventData IJsonModel<KeyVaultKeyExpiredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultKeyExpiredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultKeyExpiredEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultKeyExpiredEventData DeserializeKeyVaultKeyExpiredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultKeyExpiredEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultKeyExpiredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultKeyExpiredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultKeyExpiredEventData IPersistableModel<KeyVaultKeyExpiredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultKeyExpiredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultKeyExpiredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultKeyExpiredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultKeyExpiredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultKeyExpiredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyExpiredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyExpiredEventData.cs
deleted file mode 100644
index 673c5bcc5b78..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyExpiredEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.KeyExpired event. </summary>
-    public partial class KeyVaultKeyExpiredEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultKeyExpiredEventData"/>. </summary>
-        internal KeyVaultKeyExpiredEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultKeyExpiredEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultKeyExpiredEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNearExpiryEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNearExpiryEventData.Serialization.cs
deleted file mode 100644
index 57bfc5f4618c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNearExpiryEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultKeyNearExpiryEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultKeyNearExpiryEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultKeyNearExpiryEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultKeyNearExpiryEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultKeyNearExpiryEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultKeyNearExpiryEventData IJsonModel<KeyVaultKeyNearExpiryEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultKeyNearExpiryEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultKeyNearExpiryEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultKeyNearExpiryEventData DeserializeKeyVaultKeyNearExpiryEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultKeyNearExpiryEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultKeyNearExpiryEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultKeyNearExpiryEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultKeyNearExpiryEventData IPersistableModel<KeyVaultKeyNearExpiryEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultKeyNearExpiryEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultKeyNearExpiryEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultKeyNearExpiryEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultKeyNearExpiryEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultKeyNearExpiryEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNearExpiryEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNearExpiryEventData.cs
deleted file mode 100644
index 97ceefad9691..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNearExpiryEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.KeyNearExpiry event. </summary>
-    public partial class KeyVaultKeyNearExpiryEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultKeyNearExpiryEventData"/>. </summary>
-        internal KeyVaultKeyNearExpiryEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultKeyNearExpiryEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultKeyNearExpiryEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNewVersionCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNewVersionCreatedEventData.Serialization.cs
deleted file mode 100644
index ff158b77a99d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNewVersionCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultKeyNewVersionCreatedEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultKeyNewVersionCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultKeyNewVersionCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultKeyNewVersionCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultKeyNewVersionCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultKeyNewVersionCreatedEventData IJsonModel<KeyVaultKeyNewVersionCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultKeyNewVersionCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultKeyNewVersionCreatedEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultKeyNewVersionCreatedEventData DeserializeKeyVaultKeyNewVersionCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultKeyNewVersionCreatedEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultKeyNewVersionCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultKeyNewVersionCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultKeyNewVersionCreatedEventData IPersistableModel<KeyVaultKeyNewVersionCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultKeyNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultKeyNewVersionCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultKeyNewVersionCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultKeyNewVersionCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultKeyNewVersionCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultKeyNewVersionCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNewVersionCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNewVersionCreatedEventData.cs
deleted file mode 100644
index 1f656d1e5b92..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultKeyNewVersionCreatedEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.KeyNewVersionCreated event. </summary>
-    public partial class KeyVaultKeyNewVersionCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultKeyNewVersionCreatedEventData"/>. </summary>
-        internal KeyVaultKeyNewVersionCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultKeyNewVersionCreatedEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultKeyNewVersionCreatedEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretExpiredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretExpiredEventData.Serialization.cs
deleted file mode 100644
index efa809daa4ef..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretExpiredEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultSecretExpiredEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultSecretExpiredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultSecretExpiredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultSecretExpiredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultSecretExpiredEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultSecretExpiredEventData IJsonModel<KeyVaultSecretExpiredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultSecretExpiredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultSecretExpiredEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultSecretExpiredEventData DeserializeKeyVaultSecretExpiredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultSecretExpiredEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultSecretExpiredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultSecretExpiredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultSecretExpiredEventData IPersistableModel<KeyVaultSecretExpiredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretExpiredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultSecretExpiredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultSecretExpiredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultSecretExpiredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultSecretExpiredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultSecretExpiredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretExpiredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretExpiredEventData.cs
deleted file mode 100644
index 8746341b9068..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretExpiredEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.SecretExpired event. </summary>
-    public partial class KeyVaultSecretExpiredEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultSecretExpiredEventData"/>. </summary>
-        internal KeyVaultSecretExpiredEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultSecretExpiredEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultSecretExpiredEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNearExpiryEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNearExpiryEventData.Serialization.cs
deleted file mode 100644
index 563a0c32ffe0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNearExpiryEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultSecretNearExpiryEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultSecretNearExpiryEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultSecretNearExpiryEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultSecretNearExpiryEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultSecretNearExpiryEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultSecretNearExpiryEventData IJsonModel<KeyVaultSecretNearExpiryEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultSecretNearExpiryEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultSecretNearExpiryEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultSecretNearExpiryEventData DeserializeKeyVaultSecretNearExpiryEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultSecretNearExpiryEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultSecretNearExpiryEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultSecretNearExpiryEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultSecretNearExpiryEventData IPersistableModel<KeyVaultSecretNearExpiryEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretNearExpiryEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultSecretNearExpiryEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultSecretNearExpiryEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultSecretNearExpiryEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultSecretNearExpiryEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultSecretNearExpiryEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNearExpiryEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNearExpiryEventData.cs
deleted file mode 100644
index a80db5eef3f0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNearExpiryEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.SecretNearExpiry event. </summary>
-    public partial class KeyVaultSecretNearExpiryEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultSecretNearExpiryEventData"/>. </summary>
-        internal KeyVaultSecretNearExpiryEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultSecretNearExpiryEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultSecretNearExpiryEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNewVersionCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNewVersionCreatedEventData.Serialization.cs
deleted file mode 100644
index 867bf49c9495..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNewVersionCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class KeyVaultSecretNewVersionCreatedEventData : IUtf8JsonSerializable, IJsonModel<KeyVaultSecretNewVersionCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KeyVaultSecretNewVersionCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<KeyVaultSecretNewVersionCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultSecretNewVersionCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("Id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(VaultName))
-            {
-                writer.WritePropertyName("VaultName"u8);
-                writer.WriteStringValue(VaultName);
-            }
-            if (Optional.IsDefined(ObjectType))
-            {
-                writer.WritePropertyName("ObjectType"u8);
-                writer.WriteStringValue(ObjectType);
-            }
-            if (Optional.IsDefined(ObjectName))
-            {
-                writer.WritePropertyName("ObjectName"u8);
-                writer.WriteStringValue(ObjectName);
-            }
-            if (Optional.IsDefined(Version))
-            {
-                writer.WritePropertyName("Version"u8);
-                writer.WriteStringValue(Version);
-            }
-            if (Optional.IsDefined(NBF))
-            {
-                writer.WritePropertyName("NBF"u8);
-                writer.WriteNumberValue(NBF.Value);
-            }
-            if (Optional.IsDefined(EXP))
-            {
-                writer.WritePropertyName("EXP"u8);
-                writer.WriteNumberValue(EXP.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        KeyVaultSecretNewVersionCreatedEventData IJsonModel<KeyVaultSecretNewVersionCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(KeyVaultSecretNewVersionCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeKeyVaultSecretNewVersionCreatedEventData(document.RootElement, options);
-        }
-
-        internal static KeyVaultSecretNewVersionCreatedEventData DeserializeKeyVaultSecretNewVersionCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string vaultName = default;
-            string objectType = default;
-            string objectName = default;
-            string version = default;
-            float? nbf = default;
-            float? exp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("Id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("VaultName"u8))
-                {
-                    vaultName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectType"u8))
-                {
-                    objectType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ObjectName"u8))
-                {
-                    objectName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Version"u8))
-                {
-                    version = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("NBF"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nbf = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("EXP"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    exp = property.Value.GetSingle();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KeyVaultSecretNewVersionCreatedEventData(
-                id,
-                vaultName,
-                objectType,
-                objectName,
-                version,
-                nbf,
-                exp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<KeyVaultSecretNewVersionCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultSecretNewVersionCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        KeyVaultSecretNewVersionCreatedEventData IPersistableModel<KeyVaultSecretNewVersionCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KeyVaultSecretNewVersionCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeKeyVaultSecretNewVersionCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(KeyVaultSecretNewVersionCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<KeyVaultSecretNewVersionCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static KeyVaultSecretNewVersionCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeKeyVaultSecretNewVersionCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNewVersionCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNewVersionCreatedEventData.cs
deleted file mode 100644
index b3c890bb7462..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/KeyVaultSecretNewVersionCreatedEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.KeyVault.SecretNewVersionCreated event. </summary>
-    public partial class KeyVaultSecretNewVersionCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultSecretNewVersionCreatedEventData"/>. </summary>
-        internal KeyVaultSecretNewVersionCreatedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="KeyVaultSecretNewVersionCreatedEventData"/>. </summary>
-        /// <param name="id"> The id of the object that triggered this event. </param>
-        /// <param name="vaultName"> Key vault name of the object that triggered this event. </param>
-        /// <param name="objectType"> The type of the object that triggered this event. </param>
-        /// <param name="objectName"> The name of the object that triggered this event. </param>
-        /// <param name="version"> The version of the object that triggered this event. </param>
-        /// <param name="nbf"> Not before date of the object that triggered this event. </param>
-        /// <param name="exp"> The expiration date of the object that triggered this event. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KeyVaultSecretNewVersionCreatedEventData(string id, string vaultName, string objectType, string objectName, string version, float? nbf, float? exp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            VaultName = vaultName;
-            ObjectType = objectType;
-            ObjectName = objectName;
-            Version = version;
-            NBF = nbf;
-            EXP = exp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The id of the object that triggered this event. </summary>
-        public string Id { get; }
-        /// <summary> Key vault name of the object that triggered this event. </summary>
-        public string VaultName { get; }
-        /// <summary> The type of the object that triggered this event. </summary>
-        public string ObjectType { get; }
-        /// <summary> The name of the object that triggered this event. </summary>
-        public string ObjectName { get; }
-        /// <summary> The version of the object that triggered this event. </summary>
-        public string Version { get; }
-        /// <summary> Not before date of the object that triggered this event. </summary>
-        public float? NBF { get; }
-        /// <summary> The expiration date of the object that triggered this event. </summary>
-        public float? EXP { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesDatasetDriftDetectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesDatasetDriftDetectedEventData.Serialization.cs
deleted file mode 100644
index 09b738ad26da..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesDatasetDriftDetectedEventData.Serialization.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MachineLearningServicesDatasetDriftDetectedEventData : IUtf8JsonSerializable, IJsonModel<MachineLearningServicesDatasetDriftDetectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MachineLearningServicesDatasetDriftDetectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MachineLearningServicesDatasetDriftDetectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesDatasetDriftDetectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesDatasetDriftDetectedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(DataDriftId))
-            {
-                writer.WritePropertyName("dataDriftId"u8);
-                writer.WriteStringValue(DataDriftId);
-            }
-            if (Optional.IsDefined(DataDriftName))
-            {
-                writer.WritePropertyName("dataDriftName"u8);
-                writer.WriteStringValue(DataDriftName);
-            }
-            if (Optional.IsDefined(RunId))
-            {
-                writer.WritePropertyName("runId"u8);
-                writer.WriteStringValue(RunId);
-            }
-            if (Optional.IsDefined(BaseDatasetId))
-            {
-                writer.WritePropertyName("baseDatasetId"u8);
-                writer.WriteStringValue(BaseDatasetId);
-            }
-            if (Optional.IsDefined(TargetDatasetId))
-            {
-                writer.WritePropertyName("targetDatasetId"u8);
-                writer.WriteStringValue(TargetDatasetId);
-            }
-            if (Optional.IsDefined(DriftCoefficient))
-            {
-                writer.WritePropertyName("driftCoefficient"u8);
-                writer.WriteNumberValue(DriftCoefficient.Value);
-            }
-            writer.WritePropertyName("startTime"u8);
-            writer.WriteStringValue(StartTime, "O");
-            writer.WritePropertyName("endTime"u8);
-            writer.WriteStringValue(EndTime, "O");
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MachineLearningServicesDatasetDriftDetectedEventData IJsonModel<MachineLearningServicesDatasetDriftDetectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesDatasetDriftDetectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesDatasetDriftDetectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMachineLearningServicesDatasetDriftDetectedEventData(document.RootElement, options);
-        }
-
-        internal static MachineLearningServicesDatasetDriftDetectedEventData DeserializeMachineLearningServicesDatasetDriftDetectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string dataDriftId = default;
-            string dataDriftName = default;
-            string runId = default;
-            string baseDatasetId = default;
-            string targetDatasetId = default;
-            double? driftCoefficient = default;
-            DateTimeOffset startTime = default;
-            DateTimeOffset endTime = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("dataDriftId"u8))
-                {
-                    dataDriftId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("dataDriftName"u8))
-                {
-                    dataDriftName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("runId"u8))
-                {
-                    runId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("baseDatasetId"u8))
-                {
-                    baseDatasetId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("targetDatasetId"u8))
-                {
-                    targetDatasetId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("driftCoefficient"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    driftCoefficient = property.Value.GetDouble();
-                    continue;
-                }
-                if (property.NameEquals("startTime"u8))
-                {
-                    startTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("endTime"u8))
-                {
-                    endTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MachineLearningServicesDatasetDriftDetectedEventData(
-                dataDriftId,
-                dataDriftName,
-                runId,
-                baseDatasetId,
-                targetDatasetId,
-                driftCoefficient,
-                startTime,
-                endTime,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MachineLearningServicesDatasetDriftDetectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesDatasetDriftDetectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesDatasetDriftDetectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MachineLearningServicesDatasetDriftDetectedEventData IPersistableModel<MachineLearningServicesDatasetDriftDetectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesDatasetDriftDetectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMachineLearningServicesDatasetDriftDetectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesDatasetDriftDetectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MachineLearningServicesDatasetDriftDetectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MachineLearningServicesDatasetDriftDetectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMachineLearningServicesDatasetDriftDetectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesDatasetDriftDetectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesDatasetDriftDetectedEventData.cs
deleted file mode 100644
index 9027d0c37322..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesDatasetDriftDetectedEventData.cs
+++ /dev/null
@@ -1,102 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.MachineLearningServices.DatasetDriftDetected event. </summary>
-    public partial class MachineLearningServicesDatasetDriftDetectedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesDatasetDriftDetectedEventData"/>. </summary>
-        /// <param name="startTime"> The start time of the target dataset time series that resulted in drift detection. </param>
-        /// <param name="endTime"> The end time of the target dataset time series that resulted in drift detection. </param>
-        internal MachineLearningServicesDatasetDriftDetectedEventData(DateTimeOffset startTime, DateTimeOffset endTime)
-        {
-            StartTime = startTime;
-            EndTime = endTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesDatasetDriftDetectedEventData"/>. </summary>
-        /// <param name="dataDriftId"> The ID of the data drift monitor that triggered the event. </param>
-        /// <param name="dataDriftName"> The name of the data drift monitor that triggered the event. </param>
-        /// <param name="runId"> The ID of the Run that detected data drift. </param>
-        /// <param name="baseDatasetId"> The ID of the base Dataset used to detect drift. </param>
-        /// <param name="targetDatasetId"> The ID of the target Dataset used to detect drift. </param>
-        /// <param name="driftCoefficient"> The coefficient result that triggered the event. </param>
-        /// <param name="startTime"> The start time of the target dataset time series that resulted in drift detection. </param>
-        /// <param name="endTime"> The end time of the target dataset time series that resulted in drift detection. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MachineLearningServicesDatasetDriftDetectedEventData(string dataDriftId, string dataDriftName, string runId, string baseDatasetId, string targetDatasetId, double? driftCoefficient, DateTimeOffset startTime, DateTimeOffset endTime, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            DataDriftId = dataDriftId;
-            DataDriftName = dataDriftName;
-            RunId = runId;
-            BaseDatasetId = baseDatasetId;
-            TargetDatasetId = targetDatasetId;
-            DriftCoefficient = driftCoefficient;
-            StartTime = startTime;
-            EndTime = endTime;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesDatasetDriftDetectedEventData"/> for deserialization. </summary>
-        internal MachineLearningServicesDatasetDriftDetectedEventData()
-        {
-        }
-
-        /// <summary> The ID of the data drift monitor that triggered the event. </summary>
-        public string DataDriftId { get; }
-        /// <summary> The name of the data drift monitor that triggered the event. </summary>
-        public string DataDriftName { get; }
-        /// <summary> The ID of the Run that detected data drift. </summary>
-        public string RunId { get; }
-        /// <summary> The ID of the base Dataset used to detect drift. </summary>
-        public string BaseDatasetId { get; }
-        /// <summary> The ID of the target Dataset used to detect drift. </summary>
-        public string TargetDatasetId { get; }
-        /// <summary> The coefficient result that triggered the event. </summary>
-        public double? DriftCoefficient { get; }
-        /// <summary> The start time of the target dataset time series that resulted in drift detection. </summary>
-        public DateTimeOffset StartTime { get; }
-        /// <summary> The end time of the target dataset time series that resulted in drift detection. </summary>
-        public DateTimeOffset EndTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelDeployedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelDeployedEventData.Serialization.cs
deleted file mode 100644
index 508c46bcc98e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelDeployedEventData.Serialization.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MachineLearningServicesModelDeployedEventData : IUtf8JsonSerializable, IJsonModel<MachineLearningServicesModelDeployedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MachineLearningServicesModelDeployedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MachineLearningServicesModelDeployedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesModelDeployedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesModelDeployedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ServiceName))
-            {
-                writer.WritePropertyName("serviceName"u8);
-                writer.WriteStringValue(ServiceName);
-            }
-            if (Optional.IsDefined(ServiceComputeType))
-            {
-                writer.WritePropertyName("serviceComputeType"u8);
-                writer.WriteStringValue(ServiceComputeType);
-            }
-            if (Optional.IsDefined(ModelIds))
-            {
-                writer.WritePropertyName("modelIds"u8);
-                writer.WriteStringValue(ModelIds);
-            }
-            writer.WritePropertyName("serviceTags"u8);
-            writer.WriteStartObject();
-            foreach (var item in ServiceTags)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("serviceProperties"u8);
-            writer.WriteStartObject();
-            foreach (var item in ServiceProperties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MachineLearningServicesModelDeployedEventData IJsonModel<MachineLearningServicesModelDeployedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesModelDeployedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesModelDeployedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMachineLearningServicesModelDeployedEventData(document.RootElement, options);
-        }
-
-        internal static MachineLearningServicesModelDeployedEventData DeserializeMachineLearningServicesModelDeployedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string serviceName = default;
-            string serviceComputeType = default;
-            string modelIds = default;
-            IReadOnlyDictionary<string, BinaryData> serviceTags = default;
-            IReadOnlyDictionary<string, BinaryData> serviceProperties = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("serviceName"u8))
-                {
-                    serviceName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("serviceComputeType"u8))
-                {
-                    serviceComputeType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("modelIds"u8))
-                {
-                    modelIds = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("serviceTags"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    serviceTags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("serviceProperties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    serviceProperties = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MachineLearningServicesModelDeployedEventData(
-                serviceName,
-                serviceComputeType,
-                modelIds,
-                serviceTags,
-                serviceProperties,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MachineLearningServicesModelDeployedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesModelDeployedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesModelDeployedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MachineLearningServicesModelDeployedEventData IPersistableModel<MachineLearningServicesModelDeployedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesModelDeployedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMachineLearningServicesModelDeployedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesModelDeployedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MachineLearningServicesModelDeployedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MachineLearningServicesModelDeployedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMachineLearningServicesModelDeployedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelDeployedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelDeployedEventData.cs
deleted file mode 100644
index 8d759992c57d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelDeployedEventData.cs
+++ /dev/null
@@ -1,152 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.MachineLearningServices.ModelDeployed event. </summary>
-    public partial class MachineLearningServicesModelDeployedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesModelDeployedEventData"/>. </summary>
-        /// <param name="serviceTags"> The tags of the deployed service. </param>
-        /// <param name="serviceProperties"> The properties of the deployed service. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="serviceTags"/> or <paramref name="serviceProperties"/> is null. </exception>
-        internal MachineLearningServicesModelDeployedEventData(IReadOnlyDictionary<string, BinaryData> serviceTags, IReadOnlyDictionary<string, BinaryData> serviceProperties)
-        {
-            Argument.AssertNotNull(serviceTags, nameof(serviceTags));
-            Argument.AssertNotNull(serviceProperties, nameof(serviceProperties));
-
-            ServiceTags = serviceTags;
-            ServiceProperties = serviceProperties;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesModelDeployedEventData"/>. </summary>
-        /// <param name="serviceName"> The name of the deployed service. </param>
-        /// <param name="serviceComputeType"> The compute type (e.g. ACI, AKS) of the deployed service. </param>
-        /// <param name="modelIds"> A common separated list of model IDs. The IDs of the models deployed in the service. </param>
-        /// <param name="serviceTags"> The tags of the deployed service. </param>
-        /// <param name="serviceProperties"> The properties of the deployed service. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MachineLearningServicesModelDeployedEventData(string serviceName, string serviceComputeType, string modelIds, IReadOnlyDictionary<string, BinaryData> serviceTags, IReadOnlyDictionary<string, BinaryData> serviceProperties, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ServiceName = serviceName;
-            ServiceComputeType = serviceComputeType;
-            ModelIds = modelIds;
-            ServiceTags = serviceTags;
-            ServiceProperties = serviceProperties;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesModelDeployedEventData"/> for deserialization. </summary>
-        internal MachineLearningServicesModelDeployedEventData()
-        {
-        }
-
-        /// <summary> The name of the deployed service. </summary>
-        public string ServiceName { get; }
-        /// <summary> The compute type (e.g. ACI, AKS) of the deployed service. </summary>
-        public string ServiceComputeType { get; }
-        /// <summary> A common separated list of model IDs. The IDs of the models deployed in the service. </summary>
-        public string ModelIds { get; }
-        /// <summary>
-        /// The tags of the deployed service.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> ServiceTags { get; }
-        /// <summary>
-        /// The properties of the deployed service.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> ServiceProperties { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelRegisteredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelRegisteredEventData.Serialization.cs
deleted file mode 100644
index 8c623627b80b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelRegisteredEventData.Serialization.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MachineLearningServicesModelRegisteredEventData : IUtf8JsonSerializable, IJsonModel<MachineLearningServicesModelRegisteredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MachineLearningServicesModelRegisteredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MachineLearningServicesModelRegisteredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesModelRegisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesModelRegisteredEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ModelName))
-            {
-                writer.WritePropertyName("modelName"u8);
-                writer.WriteStringValue(ModelName);
-            }
-            if (Optional.IsDefined(ModelVersion))
-            {
-                writer.WritePropertyName("modelVersion"u8);
-                writer.WriteStringValue(ModelVersion);
-            }
-            writer.WritePropertyName("modelTags"u8);
-            writer.WriteStartObject();
-            foreach (var item in ModelTags)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("modelProperties"u8);
-            writer.WriteStartObject();
-            foreach (var item in ModelProperties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MachineLearningServicesModelRegisteredEventData IJsonModel<MachineLearningServicesModelRegisteredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesModelRegisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesModelRegisteredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMachineLearningServicesModelRegisteredEventData(document.RootElement, options);
-        }
-
-        internal static MachineLearningServicesModelRegisteredEventData DeserializeMachineLearningServicesModelRegisteredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string modelName = default;
-            string modelVersion = default;
-            IReadOnlyDictionary<string, BinaryData> modelTags = default;
-            IReadOnlyDictionary<string, BinaryData> modelProperties = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("modelName"u8))
-                {
-                    modelName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("modelVersion"u8))
-                {
-                    modelVersion = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("modelTags"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    modelTags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("modelProperties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    modelProperties = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MachineLearningServicesModelRegisteredEventData(modelName, modelVersion, modelTags, modelProperties, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MachineLearningServicesModelRegisteredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesModelRegisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesModelRegisteredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MachineLearningServicesModelRegisteredEventData IPersistableModel<MachineLearningServicesModelRegisteredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesModelRegisteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMachineLearningServicesModelRegisteredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesModelRegisteredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MachineLearningServicesModelRegisteredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MachineLearningServicesModelRegisteredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMachineLearningServicesModelRegisteredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelRegisteredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelRegisteredEventData.cs
deleted file mode 100644
index 66af5a595773..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesModelRegisteredEventData.cs
+++ /dev/null
@@ -1,148 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.MachineLearningServices.ModelRegistered event. </summary>
-    public partial class MachineLearningServicesModelRegisteredEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesModelRegisteredEventData"/>. </summary>
-        /// <param name="modelTags"> The tags of the model that was registered. </param>
-        /// <param name="modelProperties"> The properties of the model that was registered. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="modelTags"/> or <paramref name="modelProperties"/> is null. </exception>
-        internal MachineLearningServicesModelRegisteredEventData(IReadOnlyDictionary<string, BinaryData> modelTags, IReadOnlyDictionary<string, BinaryData> modelProperties)
-        {
-            Argument.AssertNotNull(modelTags, nameof(modelTags));
-            Argument.AssertNotNull(modelProperties, nameof(modelProperties));
-
-            ModelTags = modelTags;
-            ModelProperties = modelProperties;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesModelRegisteredEventData"/>. </summary>
-        /// <param name="modelName"> The name of the model that was registered. </param>
-        /// <param name="modelVersion"> The version of the model that was registered. </param>
-        /// <param name="modelTags"> The tags of the model that was registered. </param>
-        /// <param name="modelProperties"> The properties of the model that was registered. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MachineLearningServicesModelRegisteredEventData(string modelName, string modelVersion, IReadOnlyDictionary<string, BinaryData> modelTags, IReadOnlyDictionary<string, BinaryData> modelProperties, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ModelName = modelName;
-            ModelVersion = modelVersion;
-            ModelTags = modelTags;
-            ModelProperties = modelProperties;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesModelRegisteredEventData"/> for deserialization. </summary>
-        internal MachineLearningServicesModelRegisteredEventData()
-        {
-        }
-
-        /// <summary> The name of the model that was registered. </summary>
-        public string ModelName { get; }
-        /// <summary> The version of the model that was registered. </summary>
-        public string ModelVersion { get; }
-        /// <summary>
-        /// The tags of the model that was registered.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> ModelTags { get; }
-        /// <summary>
-        /// The properties of the model that was registered.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> ModelProperties { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunCompletedEventData.Serialization.cs
deleted file mode 100644
index afd9a764a504..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MachineLearningServicesRunCompletedEventData : IUtf8JsonSerializable, IJsonModel<MachineLearningServicesRunCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MachineLearningServicesRunCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MachineLearningServicesRunCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesRunCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesRunCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ExperimentId))
-            {
-                writer.WritePropertyName("experimentId"u8);
-                writer.WriteStringValue(ExperimentId);
-            }
-            if (Optional.IsDefined(ExperimentName))
-            {
-                writer.WritePropertyName("experimentName"u8);
-                writer.WriteStringValue(ExperimentName);
-            }
-            if (Optional.IsDefined(RunId))
-            {
-                writer.WritePropertyName("runId"u8);
-                writer.WriteStringValue(RunId);
-            }
-            if (Optional.IsDefined(RunType))
-            {
-                writer.WritePropertyName("runType"u8);
-                writer.WriteStringValue(RunType);
-            }
-            writer.WritePropertyName("runTags"u8);
-            writer.WriteStartObject();
-            foreach (var item in RunTags)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("runProperties"u8);
-            writer.WriteStartObject();
-            foreach (var item in RunProperties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MachineLearningServicesRunCompletedEventData IJsonModel<MachineLearningServicesRunCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesRunCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesRunCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMachineLearningServicesRunCompletedEventData(document.RootElement, options);
-        }
-
-        internal static MachineLearningServicesRunCompletedEventData DeserializeMachineLearningServicesRunCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string experimentId = default;
-            string experimentName = default;
-            string runId = default;
-            string runType = default;
-            IReadOnlyDictionary<string, BinaryData> runTags = default;
-            IReadOnlyDictionary<string, BinaryData> runProperties = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("experimentId"u8))
-                {
-                    experimentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("experimentName"u8))
-                {
-                    experimentName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("runId"u8))
-                {
-                    runId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("runType"u8))
-                {
-                    runType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("runTags"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    runTags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("runProperties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    runProperties = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MachineLearningServicesRunCompletedEventData(
-                experimentId,
-                experimentName,
-                runId,
-                runType,
-                runTags,
-                runProperties,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MachineLearningServicesRunCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesRunCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesRunCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MachineLearningServicesRunCompletedEventData IPersistableModel<MachineLearningServicesRunCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesRunCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMachineLearningServicesRunCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesRunCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MachineLearningServicesRunCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MachineLearningServicesRunCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMachineLearningServicesRunCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunCompletedEventData.cs
deleted file mode 100644
index e8c1fb9d4264..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunCompletedEventData.cs
+++ /dev/null
@@ -1,156 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.MachineLearningServices.RunCompleted event. </summary>
-    public partial class MachineLearningServicesRunCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesRunCompletedEventData"/>. </summary>
-        /// <param name="runTags"> The tags of the completed Run. </param>
-        /// <param name="runProperties"> The properties of the completed Run. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="runTags"/> or <paramref name="runProperties"/> is null. </exception>
-        internal MachineLearningServicesRunCompletedEventData(IReadOnlyDictionary<string, BinaryData> runTags, IReadOnlyDictionary<string, BinaryData> runProperties)
-        {
-            Argument.AssertNotNull(runTags, nameof(runTags));
-            Argument.AssertNotNull(runProperties, nameof(runProperties));
-
-            RunTags = runTags;
-            RunProperties = runProperties;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesRunCompletedEventData"/>. </summary>
-        /// <param name="experimentId"> The ID of the experiment that the run belongs to. </param>
-        /// <param name="experimentName"> The name of the experiment that the run belongs to. </param>
-        /// <param name="runId"> The ID of the Run that was completed. </param>
-        /// <param name="runType"> The Run Type of the completed Run. </param>
-        /// <param name="runTags"> The tags of the completed Run. </param>
-        /// <param name="runProperties"> The properties of the completed Run. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MachineLearningServicesRunCompletedEventData(string experimentId, string experimentName, string runId, string runType, IReadOnlyDictionary<string, BinaryData> runTags, IReadOnlyDictionary<string, BinaryData> runProperties, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ExperimentId = experimentId;
-            ExperimentName = experimentName;
-            RunId = runId;
-            RunType = runType;
-            RunTags = runTags;
-            RunProperties = runProperties;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesRunCompletedEventData"/> for deserialization. </summary>
-        internal MachineLearningServicesRunCompletedEventData()
-        {
-        }
-
-        /// <summary> The ID of the experiment that the run belongs to. </summary>
-        public string ExperimentId { get; }
-        /// <summary> The name of the experiment that the run belongs to. </summary>
-        public string ExperimentName { get; }
-        /// <summary> The ID of the Run that was completed. </summary>
-        public string RunId { get; }
-        /// <summary> The Run Type of the completed Run. </summary>
-        public string RunType { get; }
-        /// <summary>
-        /// The tags of the completed Run.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> RunTags { get; }
-        /// <summary>
-        /// The properties of the completed Run.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> RunProperties { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunStatusChangedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunStatusChangedEventData.Serialization.cs
deleted file mode 100644
index bf9acb0dc685..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunStatusChangedEventData.Serialization.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MachineLearningServicesRunStatusChangedEventData : IUtf8JsonSerializable, IJsonModel<MachineLearningServicesRunStatusChangedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MachineLearningServicesRunStatusChangedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MachineLearningServicesRunStatusChangedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesRunStatusChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesRunStatusChangedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ExperimentId))
-            {
-                writer.WritePropertyName("experimentId"u8);
-                writer.WriteStringValue(ExperimentId);
-            }
-            if (Optional.IsDefined(ExperimentName))
-            {
-                writer.WritePropertyName("experimentName"u8);
-                writer.WriteStringValue(ExperimentName);
-            }
-            if (Optional.IsDefined(RunId))
-            {
-                writer.WritePropertyName("runId"u8);
-                writer.WriteStringValue(RunId);
-            }
-            if (Optional.IsDefined(RunType))
-            {
-                writer.WritePropertyName("runType"u8);
-                writer.WriteStringValue(RunType);
-            }
-            writer.WritePropertyName("runTags"u8);
-            writer.WriteStartObject();
-            foreach (var item in RunTags)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("runProperties"u8);
-            writer.WriteStartObject();
-            foreach (var item in RunProperties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(RunStatus))
-            {
-                writer.WritePropertyName("runStatus"u8);
-                writer.WriteStringValue(RunStatus);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MachineLearningServicesRunStatusChangedEventData IJsonModel<MachineLearningServicesRunStatusChangedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesRunStatusChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MachineLearningServicesRunStatusChangedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMachineLearningServicesRunStatusChangedEventData(document.RootElement, options);
-        }
-
-        internal static MachineLearningServicesRunStatusChangedEventData DeserializeMachineLearningServicesRunStatusChangedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string experimentId = default;
-            string experimentName = default;
-            string runId = default;
-            string runType = default;
-            IReadOnlyDictionary<string, BinaryData> runTags = default;
-            IReadOnlyDictionary<string, BinaryData> runProperties = default;
-            string runStatus = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("experimentId"u8))
-                {
-                    experimentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("experimentName"u8))
-                {
-                    experimentName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("runId"u8))
-                {
-                    runId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("runType"u8))
-                {
-                    runType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("runTags"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    runTags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("runProperties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    runProperties = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("runStatus"u8))
-                {
-                    runStatus = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MachineLearningServicesRunStatusChangedEventData(
-                experimentId,
-                experimentName,
-                runId,
-                runType,
-                runTags,
-                runProperties,
-                runStatus,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MachineLearningServicesRunStatusChangedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesRunStatusChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesRunStatusChangedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MachineLearningServicesRunStatusChangedEventData IPersistableModel<MachineLearningServicesRunStatusChangedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MachineLearningServicesRunStatusChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMachineLearningServicesRunStatusChangedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MachineLearningServicesRunStatusChangedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MachineLearningServicesRunStatusChangedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MachineLearningServicesRunStatusChangedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMachineLearningServicesRunStatusChangedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunStatusChangedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunStatusChangedEventData.cs
deleted file mode 100644
index 8af67e302b82..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MachineLearningServicesRunStatusChangedEventData.cs
+++ /dev/null
@@ -1,160 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.MachineLearningServices.RunStatusChanged event. </summary>
-    public partial class MachineLearningServicesRunStatusChangedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesRunStatusChangedEventData"/>. </summary>
-        /// <param name="runTags"> The tags of the Machine Learning Run. </param>
-        /// <param name="runProperties"> The properties of the Machine Learning Run. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="runTags"/> or <paramref name="runProperties"/> is null. </exception>
-        internal MachineLearningServicesRunStatusChangedEventData(IReadOnlyDictionary<string, BinaryData> runTags, IReadOnlyDictionary<string, BinaryData> runProperties)
-        {
-            Argument.AssertNotNull(runTags, nameof(runTags));
-            Argument.AssertNotNull(runProperties, nameof(runProperties));
-
-            RunTags = runTags;
-            RunProperties = runProperties;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesRunStatusChangedEventData"/>. </summary>
-        /// <param name="experimentId"> The ID of the experiment that the Machine Learning Run belongs to. </param>
-        /// <param name="experimentName"> The name of the experiment that the Machine Learning Run belongs to. </param>
-        /// <param name="runId"> The ID of the Machine Learning Run. </param>
-        /// <param name="runType"> The Run Type of the Machine Learning Run. </param>
-        /// <param name="runTags"> The tags of the Machine Learning Run. </param>
-        /// <param name="runProperties"> The properties of the Machine Learning Run. </param>
-        /// <param name="runStatus"> The status of the Machine Learning Run. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MachineLearningServicesRunStatusChangedEventData(string experimentId, string experimentName, string runId, string runType, IReadOnlyDictionary<string, BinaryData> runTags, IReadOnlyDictionary<string, BinaryData> runProperties, string runStatus, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ExperimentId = experimentId;
-            ExperimentName = experimentName;
-            RunId = runId;
-            RunType = runType;
-            RunTags = runTags;
-            RunProperties = runProperties;
-            RunStatus = runStatus;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MachineLearningServicesRunStatusChangedEventData"/> for deserialization. </summary>
-        internal MachineLearningServicesRunStatusChangedEventData()
-        {
-        }
-
-        /// <summary> The ID of the experiment that the Machine Learning Run belongs to. </summary>
-        public string ExperimentId { get; }
-        /// <summary> The name of the experiment that the Machine Learning Run belongs to. </summary>
-        public string ExperimentName { get; }
-        /// <summary> The ID of the Machine Learning Run. </summary>
-        public string RunId { get; }
-        /// <summary> The Run Type of the Machine Learning Run. </summary>
-        public string RunType { get; }
-        /// <summary>
-        /// The tags of the Machine Learning Run.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> RunTags { get; }
-        /// <summary>
-        /// The properties of the Machine Learning Run.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> RunProperties { get; }
-        /// <summary> The status of the Machine Learning Run. </summary>
-        public string RunStatus { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEnteredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEnteredEventData.Serialization.cs
deleted file mode 100644
index f7b0985ec757..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEnteredEventData.Serialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MapsGeofenceEnteredEventData : IUtf8JsonSerializable, IJsonModel<MapsGeofenceEnteredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MapsGeofenceEnteredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MapsGeofenceEnteredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceEnteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceEnteredEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MapsGeofenceEnteredEventData IJsonModel<MapsGeofenceEnteredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceEnteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceEnteredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMapsGeofenceEnteredEventData(document.RootElement, options);
-        }
-
-        internal static MapsGeofenceEnteredEventData DeserializeMapsGeofenceEnteredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<string> expiredGeofenceGeometryId = default;
-            IReadOnlyList<MapsGeofenceGeometry> geometries = default;
-            IReadOnlyList<string> invalidPeriodGeofenceGeometryId = default;
-            bool? isEventPublished = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("expiredGeofenceGeometryId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    expiredGeofenceGeometryId = array;
-                    continue;
-                }
-                if (property.NameEquals("geometries"u8))
-                {
-                    List<MapsGeofenceGeometry> array = new List<MapsGeofenceGeometry>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(MapsGeofenceGeometry.DeserializeMapsGeofenceGeometry(item, options));
-                    }
-                    geometries = array;
-                    continue;
-                }
-                if (property.NameEquals("invalidPeriodGeofenceGeometryId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    invalidPeriodGeofenceGeometryId = array;
-                    continue;
-                }
-                if (property.NameEquals("isEventPublished"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    isEventPublished = property.Value.GetBoolean();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MapsGeofenceEnteredEventData(expiredGeofenceGeometryId ?? new ChangeTrackingList<string>(), geometries, invalidPeriodGeofenceGeometryId ?? new ChangeTrackingList<string>(), isEventPublished, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MapsGeofenceEnteredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceEnteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceEnteredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MapsGeofenceEnteredEventData IPersistableModel<MapsGeofenceEnteredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceEnteredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMapsGeofenceEnteredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceEnteredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MapsGeofenceEnteredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MapsGeofenceEnteredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMapsGeofenceEnteredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEnteredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEnteredEventData.cs
deleted file mode 100644
index caa8d8598b3a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEnteredEventData.cs
+++ /dev/null
@@ -1,39 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Maps.GeofenceEntered event. </summary>
-    public partial class MapsGeofenceEnteredEventData : MapsGeofenceEventProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceEnteredEventData"/>. </summary>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="geometries"/> is null. </exception>
-        internal MapsGeofenceEnteredEventData(IEnumerable<MapsGeofenceGeometry> geometries) : base(geometries)
-        {
-            Argument.AssertNotNull(geometries, nameof(geometries));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceEnteredEventData"/>. </summary>
-        /// <param name="expiredGeofenceGeometryId"> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </param>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <param name="invalidPeriodGeofenceGeometryId"> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </param>
-        /// <param name="isEventPublished"> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MapsGeofenceEnteredEventData(IReadOnlyList<string> expiredGeofenceGeometryId, IReadOnlyList<MapsGeofenceGeometry> geometries, IReadOnlyList<string> invalidPeriodGeofenceGeometryId, bool? isEventPublished, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(expiredGeofenceGeometryId, geometries, invalidPeriodGeofenceGeometryId, isEventPublished, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceEnteredEventData"/> for deserialization. </summary>
-        internal MapsGeofenceEnteredEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEventProperties.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEventProperties.Serialization.cs
deleted file mode 100644
index 635983826079..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEventProperties.Serialization.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MapsGeofenceEventProperties : IUtf8JsonSerializable, IJsonModel<MapsGeofenceEventProperties>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MapsGeofenceEventProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MapsGeofenceEventProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceEventProperties)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsCollectionDefined(ExpiredGeofenceGeometryId))
-            {
-                writer.WritePropertyName("expiredGeofenceGeometryId"u8);
-                writer.WriteStartArray();
-                foreach (var item in ExpiredGeofenceGeometryId)
-                {
-                    writer.WriteStringValue(item);
-                }
-                writer.WriteEndArray();
-            }
-            writer.WritePropertyName("geometries"u8);
-            writer.WriteStartArray();
-            foreach (var item in Geometries)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            if (Optional.IsCollectionDefined(InvalidPeriodGeofenceGeometryId))
-            {
-                writer.WritePropertyName("invalidPeriodGeofenceGeometryId"u8);
-                writer.WriteStartArray();
-                foreach (var item in InvalidPeriodGeofenceGeometryId)
-                {
-                    writer.WriteStringValue(item);
-                }
-                writer.WriteEndArray();
-            }
-            if (Optional.IsDefined(IsEventPublished))
-            {
-                writer.WritePropertyName("isEventPublished"u8);
-                writer.WriteBooleanValue(IsEventPublished.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MapsGeofenceEventProperties IJsonModel<MapsGeofenceEventProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceEventProperties)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMapsGeofenceEventProperties(document.RootElement, options);
-        }
-
-        internal static MapsGeofenceEventProperties DeserializeMapsGeofenceEventProperties(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<string> expiredGeofenceGeometryId = default;
-            IReadOnlyList<MapsGeofenceGeometry> geometries = default;
-            IReadOnlyList<string> invalidPeriodGeofenceGeometryId = default;
-            bool? isEventPublished = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("expiredGeofenceGeometryId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    expiredGeofenceGeometryId = array;
-                    continue;
-                }
-                if (property.NameEquals("geometries"u8))
-                {
-                    List<MapsGeofenceGeometry> array = new List<MapsGeofenceGeometry>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(MapsGeofenceGeometry.DeserializeMapsGeofenceGeometry(item, options));
-                    }
-                    geometries = array;
-                    continue;
-                }
-                if (property.NameEquals("invalidPeriodGeofenceGeometryId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    invalidPeriodGeofenceGeometryId = array;
-                    continue;
-                }
-                if (property.NameEquals("isEventPublished"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    isEventPublished = property.Value.GetBoolean();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MapsGeofenceEventProperties(expiredGeofenceGeometryId ?? new ChangeTrackingList<string>(), geometries, invalidPeriodGeofenceGeometryId ?? new ChangeTrackingList<string>(), isEventPublished, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MapsGeofenceEventProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceEventProperties)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MapsGeofenceEventProperties IPersistableModel<MapsGeofenceEventProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceEventProperties>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMapsGeofenceEventProperties(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceEventProperties)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MapsGeofenceEventProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MapsGeofenceEventProperties FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMapsGeofenceEventProperties(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEventProperties.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEventProperties.cs
deleted file mode 100644
index 24bbadc64e67..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceEventProperties.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Geofence event (GeofenceEntered, GeofenceExited, GeofenceResult). </summary>
-    public partial class MapsGeofenceEventProperties
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceEventProperties"/>. </summary>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="geometries"/> is null. </exception>
-        internal MapsGeofenceEventProperties(IEnumerable<MapsGeofenceGeometry> geometries)
-        {
-            Argument.AssertNotNull(geometries, nameof(geometries));
-
-            ExpiredGeofenceGeometryId = new ChangeTrackingList<string>();
-            Geometries = geometries.ToList();
-            InvalidPeriodGeofenceGeometryId = new ChangeTrackingList<string>();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceEventProperties"/>. </summary>
-        /// <param name="expiredGeofenceGeometryId"> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </param>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <param name="invalidPeriodGeofenceGeometryId"> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </param>
-        /// <param name="isEventPublished"> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MapsGeofenceEventProperties(IReadOnlyList<string> expiredGeofenceGeometryId, IReadOnlyList<MapsGeofenceGeometry> geometries, IReadOnlyList<string> invalidPeriodGeofenceGeometryId, bool? isEventPublished, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ExpiredGeofenceGeometryId = expiredGeofenceGeometryId;
-            Geometries = geometries;
-            InvalidPeriodGeofenceGeometryId = invalidPeriodGeofenceGeometryId;
-            IsEventPublished = isEventPublished;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceEventProperties"/> for deserialization. </summary>
-        internal MapsGeofenceEventProperties()
-        {
-        }
-
-        /// <summary> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </summary>
-        public IReadOnlyList<string> ExpiredGeofenceGeometryId { get; }
-        /// <summary> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </summary>
-        public IReadOnlyList<MapsGeofenceGeometry> Geometries { get; }
-        /// <summary> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </summary>
-        public IReadOnlyList<string> InvalidPeriodGeofenceGeometryId { get; }
-        /// <summary> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </summary>
-        public bool? IsEventPublished { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceExitedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceExitedEventData.Serialization.cs
deleted file mode 100644
index 935bd573b2b1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceExitedEventData.Serialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MapsGeofenceExitedEventData : IUtf8JsonSerializable, IJsonModel<MapsGeofenceExitedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MapsGeofenceExitedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MapsGeofenceExitedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceExitedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceExitedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MapsGeofenceExitedEventData IJsonModel<MapsGeofenceExitedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceExitedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceExitedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMapsGeofenceExitedEventData(document.RootElement, options);
-        }
-
-        internal static MapsGeofenceExitedEventData DeserializeMapsGeofenceExitedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<string> expiredGeofenceGeometryId = default;
-            IReadOnlyList<MapsGeofenceGeometry> geometries = default;
-            IReadOnlyList<string> invalidPeriodGeofenceGeometryId = default;
-            bool? isEventPublished = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("expiredGeofenceGeometryId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    expiredGeofenceGeometryId = array;
-                    continue;
-                }
-                if (property.NameEquals("geometries"u8))
-                {
-                    List<MapsGeofenceGeometry> array = new List<MapsGeofenceGeometry>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(MapsGeofenceGeometry.DeserializeMapsGeofenceGeometry(item, options));
-                    }
-                    geometries = array;
-                    continue;
-                }
-                if (property.NameEquals("invalidPeriodGeofenceGeometryId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    invalidPeriodGeofenceGeometryId = array;
-                    continue;
-                }
-                if (property.NameEquals("isEventPublished"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    isEventPublished = property.Value.GetBoolean();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MapsGeofenceExitedEventData(expiredGeofenceGeometryId ?? new ChangeTrackingList<string>(), geometries, invalidPeriodGeofenceGeometryId ?? new ChangeTrackingList<string>(), isEventPublished, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MapsGeofenceExitedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceExitedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceExitedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MapsGeofenceExitedEventData IPersistableModel<MapsGeofenceExitedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceExitedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMapsGeofenceExitedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceExitedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MapsGeofenceExitedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MapsGeofenceExitedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMapsGeofenceExitedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceExitedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceExitedEventData.cs
deleted file mode 100644
index 3503ee43ec5b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceExitedEventData.cs
+++ /dev/null
@@ -1,39 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Maps.GeofenceExited event. </summary>
-    public partial class MapsGeofenceExitedEventData : MapsGeofenceEventProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceExitedEventData"/>. </summary>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="geometries"/> is null. </exception>
-        internal MapsGeofenceExitedEventData(IEnumerable<MapsGeofenceGeometry> geometries) : base(geometries)
-        {
-            Argument.AssertNotNull(geometries, nameof(geometries));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceExitedEventData"/>. </summary>
-        /// <param name="expiredGeofenceGeometryId"> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </param>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <param name="invalidPeriodGeofenceGeometryId"> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </param>
-        /// <param name="isEventPublished"> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MapsGeofenceExitedEventData(IReadOnlyList<string> expiredGeofenceGeometryId, IReadOnlyList<MapsGeofenceGeometry> geometries, IReadOnlyList<string> invalidPeriodGeofenceGeometryId, bool? isEventPublished, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(expiredGeofenceGeometryId, geometries, invalidPeriodGeofenceGeometryId, isEventPublished, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceExitedEventData"/> for deserialization. </summary>
-        internal MapsGeofenceExitedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceGeometry.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceGeometry.Serialization.cs
deleted file mode 100644
index b0c581705604..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceGeometry.Serialization.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MapsGeofenceGeometry : IUtf8JsonSerializable, IJsonModel<MapsGeofenceGeometry>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MapsGeofenceGeometry>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MapsGeofenceGeometry>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceGeometry>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceGeometry)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(DeviceId))
-            {
-                writer.WritePropertyName("deviceId"u8);
-                writer.WriteStringValue(DeviceId);
-            }
-            if (Optional.IsDefined(Distance))
-            {
-                writer.WritePropertyName("distance"u8);
-                writer.WriteNumberValue(Distance.Value);
-            }
-            if (Optional.IsDefined(GeometryId))
-            {
-                writer.WritePropertyName("geometryId"u8);
-                writer.WriteStringValue(GeometryId);
-            }
-            if (Optional.IsDefined(NearestLat))
-            {
-                writer.WritePropertyName("nearestLat"u8);
-                writer.WriteNumberValue(NearestLat.Value);
-            }
-            if (Optional.IsDefined(NearestLon))
-            {
-                writer.WritePropertyName("nearestLon"u8);
-                writer.WriteNumberValue(NearestLon.Value);
-            }
-            if (Optional.IsDefined(UdId))
-            {
-                writer.WritePropertyName("udId"u8);
-                writer.WriteStringValue(UdId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MapsGeofenceGeometry IJsonModel<MapsGeofenceGeometry>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceGeometry>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceGeometry)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMapsGeofenceGeometry(document.RootElement, options);
-        }
-
-        internal static MapsGeofenceGeometry DeserializeMapsGeofenceGeometry(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deviceId = default;
-            float? distance = default;
-            string geometryId = default;
-            float? nearestLat = default;
-            float? nearestLon = default;
-            string udId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deviceId"u8))
-                {
-                    deviceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("distance"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    distance = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("geometryId"u8))
-                {
-                    geometryId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("nearestLat"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nearestLat = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("nearestLon"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nearestLon = property.Value.GetSingle();
-                    continue;
-                }
-                if (property.NameEquals("udId"u8))
-                {
-                    udId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MapsGeofenceGeometry(
-                deviceId,
-                distance,
-                geometryId,
-                nearestLat,
-                nearestLon,
-                udId,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MapsGeofenceGeometry>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceGeometry>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceGeometry)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MapsGeofenceGeometry IPersistableModel<MapsGeofenceGeometry>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceGeometry>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMapsGeofenceGeometry(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceGeometry)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MapsGeofenceGeometry>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MapsGeofenceGeometry FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMapsGeofenceGeometry(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceGeometry.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceGeometry.cs
deleted file mode 100644
index cbbb6ca42ac1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceGeometry.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The geofence geometry. </summary>
-    public partial class MapsGeofenceGeometry
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceGeometry"/>. </summary>
-        internal MapsGeofenceGeometry()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceGeometry"/>. </summary>
-        /// <param name="deviceId"> ID of the device. </param>
-        /// <param name="distance"> Distance from the coordinate to the closest border of the geofence. Positive means the coordinate is outside of the geofence. If the coordinate is outside of the geofence, but more than the value of searchBuffer away from the closest geofence border, then the value is 999. Negative means the coordinate is inside of the geofence. If the coordinate is inside the polygon, but more than the value of searchBuffer away from the closest geofencing border,then the value is -999. A value of 999 means that there is great confidence the coordinate is well outside the geofence. A value of -999 means that there is great confidence the coordinate is well within the geofence. </param>
-        /// <param name="geometryId"> The unique ID for the geofence geometry. </param>
-        /// <param name="nearestLat"> Latitude of the nearest point of the geometry. </param>
-        /// <param name="nearestLon"> Longitude of the nearest point of the geometry. </param>
-        /// <param name="udId"> The unique id returned from user upload service when uploading a geofence. Will not be included in geofencing post API. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MapsGeofenceGeometry(string deviceId, float? distance, string geometryId, float? nearestLat, float? nearestLon, string udId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            DeviceId = deviceId;
-            Distance = distance;
-            GeometryId = geometryId;
-            NearestLat = nearestLat;
-            NearestLon = nearestLon;
-            UdId = udId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> ID of the device. </summary>
-        public string DeviceId { get; }
-        /// <summary> Distance from the coordinate to the closest border of the geofence. Positive means the coordinate is outside of the geofence. If the coordinate is outside of the geofence, but more than the value of searchBuffer away from the closest geofence border, then the value is 999. Negative means the coordinate is inside of the geofence. If the coordinate is inside the polygon, but more than the value of searchBuffer away from the closest geofencing border,then the value is -999. A value of 999 means that there is great confidence the coordinate is well outside the geofence. A value of -999 means that there is great confidence the coordinate is well within the geofence. </summary>
-        public float? Distance { get; }
-        /// <summary> The unique ID for the geofence geometry. </summary>
-        public string GeometryId { get; }
-        /// <summary> Latitude of the nearest point of the geometry. </summary>
-        public float? NearestLat { get; }
-        /// <summary> Longitude of the nearest point of the geometry. </summary>
-        public float? NearestLon { get; }
-        /// <summary> The unique id returned from user upload service when uploading a geofence. Will not be included in geofencing post API. </summary>
-        public string UdId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceResultEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceResultEventData.Serialization.cs
deleted file mode 100644
index a17622e006ac..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceResultEventData.Serialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MapsGeofenceResultEventData : IUtf8JsonSerializable, IJsonModel<MapsGeofenceResultEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MapsGeofenceResultEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MapsGeofenceResultEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceResultEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceResultEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MapsGeofenceResultEventData IJsonModel<MapsGeofenceResultEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceResultEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MapsGeofenceResultEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMapsGeofenceResultEventData(document.RootElement, options);
-        }
-
-        internal static MapsGeofenceResultEventData DeserializeMapsGeofenceResultEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<string> expiredGeofenceGeometryId = default;
-            IReadOnlyList<MapsGeofenceGeometry> geometries = default;
-            IReadOnlyList<string> invalidPeriodGeofenceGeometryId = default;
-            bool? isEventPublished = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("expiredGeofenceGeometryId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    expiredGeofenceGeometryId = array;
-                    continue;
-                }
-                if (property.NameEquals("geometries"u8))
-                {
-                    List<MapsGeofenceGeometry> array = new List<MapsGeofenceGeometry>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(MapsGeofenceGeometry.DeserializeMapsGeofenceGeometry(item, options));
-                    }
-                    geometries = array;
-                    continue;
-                }
-                if (property.NameEquals("invalidPeriodGeofenceGeometryId"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    invalidPeriodGeofenceGeometryId = array;
-                    continue;
-                }
-                if (property.NameEquals("isEventPublished"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    isEventPublished = property.Value.GetBoolean();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MapsGeofenceResultEventData(expiredGeofenceGeometryId ?? new ChangeTrackingList<string>(), geometries, invalidPeriodGeofenceGeometryId ?? new ChangeTrackingList<string>(), isEventPublished, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MapsGeofenceResultEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceResultEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceResultEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MapsGeofenceResultEventData IPersistableModel<MapsGeofenceResultEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MapsGeofenceResultEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMapsGeofenceResultEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MapsGeofenceResultEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MapsGeofenceResultEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MapsGeofenceResultEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMapsGeofenceResultEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceResultEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceResultEventData.cs
deleted file mode 100644
index e7568ca67003..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MapsGeofenceResultEventData.cs
+++ /dev/null
@@ -1,39 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Maps.GeofenceResult event. </summary>
-    public partial class MapsGeofenceResultEventData : MapsGeofenceEventProperties
-    {
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceResultEventData"/>. </summary>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="geometries"/> is null. </exception>
-        internal MapsGeofenceResultEventData(IEnumerable<MapsGeofenceGeometry> geometries) : base(geometries)
-        {
-            Argument.AssertNotNull(geometries, nameof(geometries));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceResultEventData"/>. </summary>
-        /// <param name="expiredGeofenceGeometryId"> Lists of the geometry ID of the geofence which is expired relative to the user time in the request. </param>
-        /// <param name="geometries"> Lists the fence geometries that either fully contain the coordinate position or have an overlap with the searchBuffer around the fence. </param>
-        /// <param name="invalidPeriodGeofenceGeometryId"> Lists of the geometry ID of the geofence which is in invalid period relative to the user time in the request. </param>
-        /// <param name="isEventPublished"> True if at least one event is published to the Azure Maps event subscriber, false if no event is published to the Azure Maps event subscriber. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MapsGeofenceResultEventData(IReadOnlyList<string> expiredGeofenceGeometryId, IReadOnlyList<MapsGeofenceGeometry> geometries, IReadOnlyList<string> invalidPeriodGeofenceGeometryId, bool? isEventPublished, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(expiredGeofenceGeometryId, geometries, invalidPeriodGeofenceGeometryId, isEventPublished, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MapsGeofenceResultEventData"/> for deserialization. </summary>
-        internal MapsGeofenceResultEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCanceledEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCanceledEventData.Serialization.cs
deleted file mode 100644
index 1a4b66647616..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCanceledEventData.Serialization.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobCanceledEventData : IUtf8JsonSerializable, IJsonModel<MediaJobCanceledEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobCanceledEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobCanceledEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobCanceledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobCanceledEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("outputs"u8);
-            writer.WriteStartArray();
-            foreach (var item in Outputs)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        MediaJobCanceledEventData IJsonModel<MediaJobCanceledEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobCanceledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobCanceledEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobCanceledEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobCanceledEventData DeserializeMediaJobCanceledEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<MediaJobOutput> outputs = default;
-            MediaJobState previousState = default;
-            MediaJobState state = default;
-            IReadOnlyDictionary<string, string> correlationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("outputs"u8))
-                {
-                    List<MediaJobOutput> array = new List<MediaJobOutput>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(MediaJobOutput.DeserializeMediaJobOutput(item, options));
-                    }
-                    outputs = array;
-                    continue;
-                }
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("correlationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    correlationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobCanceledEventData(previousState, state, correlationData, serializedAdditionalRawData, outputs);
-        }
-
-        BinaryData IPersistableModel<MediaJobCanceledEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobCanceledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobCanceledEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobCanceledEventData IPersistableModel<MediaJobCanceledEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobCanceledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobCanceledEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobCanceledEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobCanceledEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobCanceledEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobCanceledEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCanceledEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCanceledEventData.cs
deleted file mode 100644
index 953505804d20..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCanceledEventData.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job canceled event data. Schema of the data property of an EventGridEvent for a
-    /// Microsoft.Media.JobCanceled event.
-    /// </summary>
-    public partial class MediaJobCanceledEventData : MediaJobStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobCanceledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="correlationData"/> or <paramref name="outputs"/> is null. </exception>
-        internal MediaJobCanceledEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IEnumerable<MediaJobOutput> outputs) : base(previousState, state, correlationData)
-        {
-            Argument.AssertNotNull(correlationData, nameof(correlationData));
-            Argument.AssertNotNull(outputs, nameof(outputs));
-
-            Outputs = outputs.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobCanceledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        internal MediaJobCanceledEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyList<MediaJobOutput> outputs) : base(previousState, state, correlationData, serializedAdditionalRawData)
-        {
-            Outputs = outputs;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobCanceledEventData"/> for deserialization. </summary>
-        internal MediaJobCanceledEventData()
-        {
-        }
-
-        /// <summary>
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </summary>
-        public IReadOnlyList<MediaJobOutput> Outputs { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCancelingEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCancelingEventData.Serialization.cs
deleted file mode 100644
index 45fd962e0fcd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCancelingEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobCancelingEventData : IUtf8JsonSerializable, IJsonModel<MediaJobCancelingEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobCancelingEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobCancelingEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobCancelingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobCancelingEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobCancelingEventData IJsonModel<MediaJobCancelingEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobCancelingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobCancelingEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobCancelingEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobCancelingEventData DeserializeMediaJobCancelingEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobState state = default;
-            IReadOnlyDictionary<string, string> correlationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("correlationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    correlationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobCancelingEventData(previousState, state, correlationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobCancelingEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobCancelingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobCancelingEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobCancelingEventData IPersistableModel<MediaJobCancelingEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobCancelingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobCancelingEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobCancelingEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobCancelingEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobCancelingEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobCancelingEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCancelingEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCancelingEventData.cs
deleted file mode 100644
index c1493f0f200e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobCancelingEventData.cs
+++ /dev/null
@@ -1,43 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job canceling event data. Schema of the data property of an EventGridEvent for
-    /// a Microsoft.Media.JobCanceling event.
-    /// </summary>
-    public partial class MediaJobCancelingEventData : MediaJobStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobCancelingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="correlationData"/> is null. </exception>
-        internal MediaJobCancelingEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData) : base(previousState, state, correlationData)
-        {
-            Argument.AssertNotNull(correlationData, nameof(correlationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobCancelingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobCancelingEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, state, correlationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobCancelingEventData"/> for deserialization. </summary>
-        internal MediaJobCancelingEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobError.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobError.Serialization.cs
deleted file mode 100644
index c3fae6ec7856..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobError.Serialization.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobError : IUtf8JsonSerializable, IJsonModel<MediaJobError>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobError>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobError)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("code"u8);
-            writer.WriteStringValue(Code.ToString());
-            if (Optional.IsDefined(Message))
-            {
-                writer.WritePropertyName("message"u8);
-                writer.WriteStringValue(Message);
-            }
-            writer.WritePropertyName("category"u8);
-            writer.WriteStringValue(Category.ToString());
-            writer.WritePropertyName("retry"u8);
-            writer.WriteStringValue(Retry.ToString());
-            writer.WritePropertyName("details"u8);
-            writer.WriteStartArray();
-            foreach (var item in Details)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaJobError IJsonModel<MediaJobError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobError)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobError(document.RootElement, options);
-        }
-
-        internal static MediaJobError DeserializeMediaJobError(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobErrorCode code = default;
-            string message = default;
-            MediaJobErrorCategory category = default;
-            MediaJobRetry retry = default;
-            IReadOnlyList<MediaJobErrorDetail> details = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("code"u8))
-                {
-                    code = new MediaJobErrorCode(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("message"u8))
-                {
-                    message = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("category"u8))
-                {
-                    category = new MediaJobErrorCategory(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("retry"u8))
-                {
-                    retry = new MediaJobRetry(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("details"u8))
-                {
-                    List<MediaJobErrorDetail> array = new List<MediaJobErrorDetail>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(MediaJobErrorDetail.DeserializeMediaJobErrorDetail(item, options));
-                    }
-                    details = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobError(
-                code,
-                message,
-                category,
-                retry,
-                details,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobError)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobError IPersistableModel<MediaJobError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobError(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobError)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaJobError FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobError(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobError.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobError.cs
deleted file mode 100644
index 751ed7d395fe..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobError.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Details of JobOutput errors. </summary>
-    public partial class MediaJobError
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobError"/>. </summary>
-        /// <param name="code"> Error code describing the error. </param>
-        /// <param name="category"> Helps with categorization of errors. </param>
-        /// <param name="retry"> Indicates that it may be possible to retry the Job. If retry is unsuccessful, please contact Azure support via Azure Portal. </param>
-        /// <param name="details"> An array of details about specific errors that led to this reported error. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="details"/> is null. </exception>
-        internal MediaJobError(MediaJobErrorCode code, MediaJobErrorCategory category, MediaJobRetry retry, IEnumerable<MediaJobErrorDetail> details)
-        {
-            Argument.AssertNotNull(details, nameof(details));
-
-            Code = code;
-            Category = category;
-            Retry = retry;
-            Details = details.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobError"/>. </summary>
-        /// <param name="code"> Error code describing the error. </param>
-        /// <param name="message"> A human-readable language-dependent representation of the error. </param>
-        /// <param name="category"> Helps with categorization of errors. </param>
-        /// <param name="retry"> Indicates that it may be possible to retry the Job. If retry is unsuccessful, please contact Azure support via Azure Portal. </param>
-        /// <param name="details"> An array of details about specific errors that led to this reported error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobError(MediaJobErrorCode code, string message, MediaJobErrorCategory category, MediaJobRetry retry, IReadOnlyList<MediaJobErrorDetail> details, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Code = code;
-            Message = message;
-            Category = category;
-            Retry = retry;
-            Details = details;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobError"/> for deserialization. </summary>
-        internal MediaJobError()
-        {
-        }
-
-        /// <summary> Error code describing the error. </summary>
-        public MediaJobErrorCode Code { get; }
-        /// <summary> A human-readable language-dependent representation of the error. </summary>
-        public string Message { get; }
-        /// <summary> Helps with categorization of errors. </summary>
-        public MediaJobErrorCategory Category { get; }
-        /// <summary> Indicates that it may be possible to retry the Job. If retry is unsuccessful, please contact Azure support via Azure Portal. </summary>
-        public MediaJobRetry Retry { get; }
-        /// <summary> An array of details about specific errors that led to this reported error. </summary>
-        public IReadOnlyList<MediaJobErrorDetail> Details { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorCategory.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorCategory.cs
deleted file mode 100644
index 1500025725f5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorCategory.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Error categories for Media Job Errors. </summary>
-    public readonly partial struct MediaJobErrorCategory : IEquatable<MediaJobErrorCategory>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobErrorCategory"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public MediaJobErrorCategory(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ServiceValue = "Service";
-        private const string DownloadValue = "Download";
-        private const string UploadValue = "Upload";
-        private const string ConfigurationValue = "Configuration";
-        private const string ContentValue = "Content";
-        private const string AccountValue = "Account";
-
-        /// <summary> The error is service related. </summary>
-        public static MediaJobErrorCategory Service { get; } = new MediaJobErrorCategory(ServiceValue);
-        /// <summary> The error is download related. </summary>
-        public static MediaJobErrorCategory Download { get; } = new MediaJobErrorCategory(DownloadValue);
-        /// <summary> The error is upload related. </summary>
-        public static MediaJobErrorCategory Upload { get; } = new MediaJobErrorCategory(UploadValue);
-        /// <summary> The error is configuration related. </summary>
-        public static MediaJobErrorCategory Configuration { get; } = new MediaJobErrorCategory(ConfigurationValue);
-        /// <summary> The error is related to data in the input files. </summary>
-        public static MediaJobErrorCategory Content { get; } = new MediaJobErrorCategory(ContentValue);
-        /// <summary> The error is related to account information. </summary>
-        public static MediaJobErrorCategory Account { get; } = new MediaJobErrorCategory(AccountValue);
-        /// <summary> Determines if two <see cref="MediaJobErrorCategory"/> values are the same. </summary>
-        public static bool operator ==(MediaJobErrorCategory left, MediaJobErrorCategory right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="MediaJobErrorCategory"/> values are not the same. </summary>
-        public static bool operator !=(MediaJobErrorCategory left, MediaJobErrorCategory right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="MediaJobErrorCategory"/>. </summary>
-        public static implicit operator MediaJobErrorCategory(string value) => new MediaJobErrorCategory(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is MediaJobErrorCategory other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(MediaJobErrorCategory other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorCode.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorCode.cs
deleted file mode 100644
index a306a0f40470..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorCode.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Media Job Error Codes. </summary>
-    public readonly partial struct MediaJobErrorCode : IEquatable<MediaJobErrorCode>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobErrorCode"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public MediaJobErrorCode(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ServiceErrorValue = "ServiceError";
-        private const string ServiceTransientErrorValue = "ServiceTransientError";
-        private const string DownloadNotAccessibleValue = "DownloadNotAccessible";
-        private const string DownloadTransientErrorValue = "DownloadTransientError";
-        private const string UploadNotAccessibleValue = "UploadNotAccessible";
-        private const string UploadTransientErrorValue = "UploadTransientError";
-        private const string ConfigurationUnsupportedValue = "ConfigurationUnsupported";
-        private const string ContentMalformedValue = "ContentMalformed";
-        private const string ContentUnsupportedValue = "ContentUnsupported";
-        private const string IdentityUnsupportedValue = "IdentityUnsupported";
-
-        /// <summary> Fatal service error, please contact support. </summary>
-        public static MediaJobErrorCode ServiceError { get; } = new MediaJobErrorCode(ServiceErrorValue);
-        /// <summary> Transient error, please retry, if retry is unsuccessful, please contact support. </summary>
-        public static MediaJobErrorCode ServiceTransientError { get; } = new MediaJobErrorCode(ServiceTransientErrorValue);
-        /// <summary> While trying to download the input files, the files were not accessible, please check the availability of the source. </summary>
-        public static MediaJobErrorCode DownloadNotAccessible { get; } = new MediaJobErrorCode(DownloadNotAccessibleValue);
-        /// <summary> While trying to download the input files, there was an issue during transfer (storage service, network errors), see details and check your source. </summary>
-        public static MediaJobErrorCode DownloadTransientError { get; } = new MediaJobErrorCode(DownloadTransientErrorValue);
-        /// <summary> While trying to upload the output files, the destination was not reachable, please check the availability of the destination. </summary>
-        public static MediaJobErrorCode UploadNotAccessible { get; } = new MediaJobErrorCode(UploadNotAccessibleValue);
-        /// <summary> While trying to upload the output files, there was an issue during transfer (storage service, network errors), see details and check your destination. </summary>
-        public static MediaJobErrorCode UploadTransientError { get; } = new MediaJobErrorCode(UploadTransientErrorValue);
-        /// <summary> There was a problem with the combination of input files and the configuration settings applied, fix the configuration settings and retry with the same input, or change input to match the configuration. </summary>
-        public static MediaJobErrorCode ConfigurationUnsupported { get; } = new MediaJobErrorCode(ConfigurationUnsupportedValue);
-        /// <summary> There was a problem with the input content (for example: zero byte files, or corrupt/non-decodable files), check the input files. </summary>
-        public static MediaJobErrorCode ContentMalformed { get; } = new MediaJobErrorCode(ContentMalformedValue);
-        /// <summary> There was a problem with the format of the input (not valid media file, or an unsupported file/codec), check the validity of the input files. </summary>
-        public static MediaJobErrorCode ContentUnsupported { get; } = new MediaJobErrorCode(ContentUnsupportedValue);
-        /// <summary> There is an error verifying to the account identity. Check and fix the identity configurations and retry. If unsuccessful, please contact support. </summary>
-        public static MediaJobErrorCode IdentityUnsupported { get; } = new MediaJobErrorCode(IdentityUnsupportedValue);
-        /// <summary> Determines if two <see cref="MediaJobErrorCode"/> values are the same. </summary>
-        public static bool operator ==(MediaJobErrorCode left, MediaJobErrorCode right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="MediaJobErrorCode"/> values are not the same. </summary>
-        public static bool operator !=(MediaJobErrorCode left, MediaJobErrorCode right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="MediaJobErrorCode"/>. </summary>
-        public static implicit operator MediaJobErrorCode(string value) => new MediaJobErrorCode(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is MediaJobErrorCode other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(MediaJobErrorCode other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorDetail.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorDetail.Serialization.cs
deleted file mode 100644
index 61ea5a6e9dfd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorDetail.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobErrorDetail : IUtf8JsonSerializable, IJsonModel<MediaJobErrorDetail>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobErrorDetail>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobErrorDetail>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobErrorDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobErrorDetail)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Code))
-            {
-                writer.WritePropertyName("code"u8);
-                writer.WriteStringValue(Code);
-            }
-            if (Optional.IsDefined(Message))
-            {
-                writer.WritePropertyName("message"u8);
-                writer.WriteStringValue(Message);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaJobErrorDetail IJsonModel<MediaJobErrorDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobErrorDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobErrorDetail)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobErrorDetail(document.RootElement, options);
-        }
-
-        internal static MediaJobErrorDetail DeserializeMediaJobErrorDetail(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string code = default;
-            string message = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("code"u8))
-                {
-                    code = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("message"u8))
-                {
-                    message = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobErrorDetail(code, message, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobErrorDetail>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobErrorDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobErrorDetail)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobErrorDetail IPersistableModel<MediaJobErrorDetail>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobErrorDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobErrorDetail(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobErrorDetail)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobErrorDetail>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaJobErrorDetail FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobErrorDetail(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorDetail.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorDetail.cs
deleted file mode 100644
index 4db19c083c43..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErrorDetail.cs
+++ /dev/null
@@ -1,69 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Details of JobOutput errors. </summary>
-    public partial class MediaJobErrorDetail
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobErrorDetail"/>. </summary>
-        internal MediaJobErrorDetail()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobErrorDetail"/>. </summary>
-        /// <param name="code"> Code describing the error detail. </param>
-        /// <param name="message"> A human-readable representation of the error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobErrorDetail(string code, string message, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Code = code;
-            Message = message;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Code describing the error detail. </summary>
-        public string Code { get; }
-        /// <summary> A human-readable representation of the error. </summary>
-        public string Message { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErroredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErroredEventData.Serialization.cs
deleted file mode 100644
index 2453e6462a1e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErroredEventData.Serialization.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobErroredEventData : IUtf8JsonSerializable, IJsonModel<MediaJobErroredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobErroredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobErroredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobErroredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobErroredEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("outputs"u8);
-            writer.WriteStartArray();
-            foreach (var item in Outputs)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        MediaJobErroredEventData IJsonModel<MediaJobErroredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobErroredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobErroredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobErroredEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobErroredEventData DeserializeMediaJobErroredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<MediaJobOutput> outputs = default;
-            MediaJobState previousState = default;
-            MediaJobState state = default;
-            IReadOnlyDictionary<string, string> correlationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("outputs"u8))
-                {
-                    List<MediaJobOutput> array = new List<MediaJobOutput>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(MediaJobOutput.DeserializeMediaJobOutput(item, options));
-                    }
-                    outputs = array;
-                    continue;
-                }
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("correlationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    correlationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobErroredEventData(previousState, state, correlationData, serializedAdditionalRawData, outputs);
-        }
-
-        BinaryData IPersistableModel<MediaJobErroredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobErroredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobErroredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobErroredEventData IPersistableModel<MediaJobErroredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobErroredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobErroredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobErroredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobErroredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobErroredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobErroredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErroredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErroredEventData.cs
deleted file mode 100644
index 0c76f70e4bc5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobErroredEventData.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job error state event data. Schema of the data property of an EventGridEvent
-    /// for a Microsoft.Media.JobErrored event.
-    /// </summary>
-    public partial class MediaJobErroredEventData : MediaJobStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobErroredEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="correlationData"/> or <paramref name="outputs"/> is null. </exception>
-        internal MediaJobErroredEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IEnumerable<MediaJobOutput> outputs) : base(previousState, state, correlationData)
-        {
-            Argument.AssertNotNull(correlationData, nameof(correlationData));
-            Argument.AssertNotNull(outputs, nameof(outputs));
-
-            Outputs = outputs.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobErroredEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        internal MediaJobErroredEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyList<MediaJobOutput> outputs) : base(previousState, state, correlationData, serializedAdditionalRawData)
-        {
-            Outputs = outputs;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobErroredEventData"/> for deserialization. </summary>
-        internal MediaJobErroredEventData()
-        {
-        }
-
-        /// <summary>
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </summary>
-        public IReadOnlyList<MediaJobOutput> Outputs { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobFinishedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobFinishedEventData.Serialization.cs
deleted file mode 100644
index 5c0168553591..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobFinishedEventData.Serialization.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobFinishedEventData : IUtf8JsonSerializable, IJsonModel<MediaJobFinishedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobFinishedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobFinishedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobFinishedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("outputs"u8);
-            writer.WriteStartArray();
-            foreach (var item in Outputs)
-            {
-                writer.WriteObjectValue(item, options);
-            }
-            writer.WriteEndArray();
-        }
-
-        MediaJobFinishedEventData IJsonModel<MediaJobFinishedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobFinishedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobFinishedEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobFinishedEventData DeserializeMediaJobFinishedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            IReadOnlyList<MediaJobOutput> outputs = default;
-            MediaJobState previousState = default;
-            MediaJobState state = default;
-            IReadOnlyDictionary<string, string> correlationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("outputs"u8))
-                {
-                    List<MediaJobOutput> array = new List<MediaJobOutput>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(MediaJobOutput.DeserializeMediaJobOutput(item, options));
-                    }
-                    outputs = array;
-                    continue;
-                }
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("correlationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    correlationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobFinishedEventData(previousState, state, correlationData, serializedAdditionalRawData, outputs);
-        }
-
-        BinaryData IPersistableModel<MediaJobFinishedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobFinishedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobFinishedEventData IPersistableModel<MediaJobFinishedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobFinishedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobFinishedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobFinishedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobFinishedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobFinishedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobFinishedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobFinishedEventData.cs
deleted file mode 100644
index 64a495eac9b8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobFinishedEventData.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job finished event data. Schema of the data property of an EventGridEvent for a
-    /// Microsoft.Media.JobFinished event.
-    /// </summary>
-    public partial class MediaJobFinishedEventData : MediaJobStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobFinishedEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="correlationData"/> or <paramref name="outputs"/> is null. </exception>
-        internal MediaJobFinishedEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IEnumerable<MediaJobOutput> outputs) : base(previousState, state, correlationData)
-        {
-            Argument.AssertNotNull(correlationData, nameof(correlationData));
-            Argument.AssertNotNull(outputs, nameof(outputs));
-
-            Outputs = outputs.ToList();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobFinishedEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="outputs">
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        internal MediaJobFinishedEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyList<MediaJobOutput> outputs) : base(previousState, state, correlationData, serializedAdditionalRawData)
-        {
-            Outputs = outputs;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobFinishedEventData"/> for deserialization. </summary>
-        internal MediaJobFinishedEventData()
-        {
-        }
-
-        /// <summary>
-        /// Gets the Job outputs.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </summary>
-        public IReadOnlyList<MediaJobOutput> Outputs { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutput.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutput.Serialization.cs
deleted file mode 100644
index 0e23a14437ba..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutput.Serialization.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    [PersistableModelProxy(typeof(UnknownMediaJobOutput))]
-    public partial class MediaJobOutput : IUtf8JsonSerializable, IJsonModel<MediaJobOutput>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutput>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutput>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutput>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutput)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("@odata.type"u8);
-            writer.WriteStringValue(OdataType);
-            writer.WritePropertyName("error"u8);
-            writer.WriteObjectValue(Error, options);
-            if (Optional.IsDefined(Label))
-            {
-                writer.WritePropertyName("label"u8);
-                writer.WriteStringValue(Label);
-            }
-            writer.WritePropertyName("progress"u8);
-            writer.WriteNumberValue(Progress);
-            writer.WritePropertyName("state"u8);
-            writer.WriteStringValue(State.ToString());
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaJobOutput IJsonModel<MediaJobOutput>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutput>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutput)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutput(document.RootElement, options);
-        }
-
-        internal static MediaJobOutput DeserializeMediaJobOutput(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            if (element.TryGetProperty("@odata.type", out JsonElement discriminator))
-            {
-                switch (discriminator.GetString())
-                {
-                    case "#Microsoft.Media.JobOutputAsset": return MediaJobOutputAsset.DeserializeMediaJobOutputAsset(element, options);
-                }
-            }
-            return UnknownMediaJobOutput.DeserializeUnknownMediaJobOutput(element, options);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutput>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutput>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutput)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutput IPersistableModel<MediaJobOutput>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutput>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutput(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutput)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutput>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaJobOutput FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutput(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutput.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutput.cs
deleted file mode 100644
index 2a5881ab7ec5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutput.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// The event data for a Job output.
-    /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-    /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-    /// </summary>
-    public abstract partial class MediaJobOutput
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutput"/>. </summary>
-        /// <param name="error"> Gets the Job output error. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="state"> Gets the Job output state. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="error"/> is null. </exception>
-        protected MediaJobOutput(MediaJobError error, long progress, MediaJobState state)
-        {
-            Argument.AssertNotNull(error, nameof(error));
-
-            Error = error;
-            Progress = progress;
-            State = state;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutput"/>. </summary>
-        /// <param name="odataType"> The discriminator for derived types. </param>
-        /// <param name="error"> Gets the Job output error. </param>
-        /// <param name="label"> Gets the Job output label. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="state"> Gets the Job output state. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutput(string odataType, MediaJobError error, string label, long progress, MediaJobState state, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            OdataType = odataType;
-            Error = error;
-            Label = label;
-            Progress = progress;
-            State = state;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutput"/> for deserialization. </summary>
-        internal MediaJobOutput()
-        {
-        }
-
-        /// <summary> The discriminator for derived types. </summary>
-        internal string OdataType { get; set; }
-        /// <summary> Gets the Job output error. </summary>
-        public MediaJobError Error { get; }
-        /// <summary> Gets the Job output label. </summary>
-        public string Label { get; }
-        /// <summary> Gets the Job output progress. </summary>
-        public long Progress { get; }
-        /// <summary> Gets the Job output state. </summary>
-        public MediaJobState State { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputAsset.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputAsset.Serialization.cs
deleted file mode 100644
index b9d1022e7fc9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputAsset.Serialization.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputAsset : IUtf8JsonSerializable, IJsonModel<MediaJobOutputAsset>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputAsset>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputAsset>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputAsset>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputAsset)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            if (Optional.IsDefined(AssetName))
-            {
-                writer.WritePropertyName("assetName"u8);
-                writer.WriteStringValue(AssetName);
-            }
-        }
-
-        MediaJobOutputAsset IJsonModel<MediaJobOutputAsset>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputAsset>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputAsset)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputAsset(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputAsset DeserializeMediaJobOutputAsset(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string assetName = default;
-            string odataType = default;
-            MediaJobError error = default;
-            string label = default;
-            long progress = default;
-            MediaJobState state = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("assetName"u8))
-                {
-                    assetName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("@odata.type"u8))
-                {
-                    odataType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("error"u8))
-                {
-                    error = MediaJobError.DeserializeMediaJobError(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("label"u8))
-                {
-                    label = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("progress"u8))
-                {
-                    progress = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputAsset(
-                odataType,
-                error,
-                label,
-                progress,
-                state,
-                serializedAdditionalRawData,
-                assetName);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputAsset>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputAsset>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputAsset)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputAsset IPersistableModel<MediaJobOutputAsset>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputAsset>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputAsset(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputAsset)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputAsset>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobOutputAsset FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputAsset(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputAsset.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputAsset.cs
deleted file mode 100644
index b43e0081261b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputAsset.cs
+++ /dev/null
@@ -1,49 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The event data for a Job output asset. </summary>
-    public partial class MediaJobOutputAsset : MediaJobOutput
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputAsset"/>. </summary>
-        /// <param name="error"> Gets the Job output error. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="state"> Gets the Job output state. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="error"/> is null. </exception>
-        internal MediaJobOutputAsset(MediaJobError error, long progress, MediaJobState state) : base(error, progress, state)
-        {
-            Argument.AssertNotNull(error, nameof(error));
-
-            OdataType = "#Microsoft.Media.JobOutputAsset";
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputAsset"/>. </summary>
-        /// <param name="odataType"> The discriminator for derived types. </param>
-        /// <param name="error"> Gets the Job output error. </param>
-        /// <param name="label"> Gets the Job output label. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="state"> Gets the Job output state. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="assetName"> Gets the Job output asset name. </param>
-        internal MediaJobOutputAsset(string odataType, MediaJobError error, string label, long progress, MediaJobState state, IDictionary<string, BinaryData> serializedAdditionalRawData, string assetName) : base(odataType, error, label, progress, state, serializedAdditionalRawData)
-        {
-            AssetName = assetName;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputAsset"/> for deserialization. </summary>
-        internal MediaJobOutputAsset()
-        {
-        }
-
-        /// <summary> Gets the Job output asset name. </summary>
-        public string AssetName { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCanceledEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCanceledEventData.Serialization.cs
deleted file mode 100644
index 0ac5b829f1dc..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCanceledEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputCanceledEventData : IUtf8JsonSerializable, IJsonModel<MediaJobOutputCanceledEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputCanceledEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputCanceledEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputCanceledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputCanceledEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobOutputCanceledEventData IJsonModel<MediaJobOutputCanceledEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputCanceledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputCanceledEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputCanceledEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputCanceledEventData DeserializeMediaJobOutputCanceledEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobOutput output = default;
-            IReadOnlyDictionary<string, string> jobCorrelationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    output = MediaJobOutput.DeserializeMediaJobOutput(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("jobCorrelationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobCorrelationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputCanceledEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputCanceledEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputCanceledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputCanceledEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputCanceledEventData IPersistableModel<MediaJobOutputCanceledEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputCanceledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputCanceledEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputCanceledEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputCanceledEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobOutputCanceledEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputCanceledEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCanceledEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCanceledEventData.cs
deleted file mode 100644
index 55ec62b58492..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCanceledEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job output canceled event data. Schema of the data property of an
-    /// EventGridEvent for a Microsoft.Media.JobOutputCanceled event.
-    /// </summary>
-    public partial class MediaJobOutputCanceledEventData : MediaJobOutputStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputCanceledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="output"/> or <paramref name="jobCorrelationData"/> is null. </exception>
-        internal MediaJobOutputCanceledEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData) : base(previousState, output, jobCorrelationData)
-        {
-            Argument.AssertNotNull(output, nameof(output));
-            Argument.AssertNotNull(jobCorrelationData, nameof(jobCorrelationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputCanceledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutputCanceledEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, output, jobCorrelationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputCanceledEventData"/> for deserialization. </summary>
-        internal MediaJobOutputCanceledEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCancelingEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCancelingEventData.Serialization.cs
deleted file mode 100644
index e1447404365e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCancelingEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputCancelingEventData : IUtf8JsonSerializable, IJsonModel<MediaJobOutputCancelingEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputCancelingEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputCancelingEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputCancelingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputCancelingEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobOutputCancelingEventData IJsonModel<MediaJobOutputCancelingEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputCancelingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputCancelingEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputCancelingEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputCancelingEventData DeserializeMediaJobOutputCancelingEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobOutput output = default;
-            IReadOnlyDictionary<string, string> jobCorrelationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    output = MediaJobOutput.DeserializeMediaJobOutput(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("jobCorrelationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobCorrelationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputCancelingEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputCancelingEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputCancelingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputCancelingEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputCancelingEventData IPersistableModel<MediaJobOutputCancelingEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputCancelingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputCancelingEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputCancelingEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputCancelingEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobOutputCancelingEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputCancelingEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCancelingEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCancelingEventData.cs
deleted file mode 100644
index 30e7d163aaa6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputCancelingEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job output canceling event data. Schema of the data property of an
-    /// EventGridEvent for a Microsoft.Media.JobOutputCanceling event.
-    /// </summary>
-    public partial class MediaJobOutputCancelingEventData : MediaJobOutputStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputCancelingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="output"/> or <paramref name="jobCorrelationData"/> is null. </exception>
-        internal MediaJobOutputCancelingEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData) : base(previousState, output, jobCorrelationData)
-        {
-            Argument.AssertNotNull(output, nameof(output));
-            Argument.AssertNotNull(jobCorrelationData, nameof(jobCorrelationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputCancelingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutputCancelingEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, output, jobCorrelationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputCancelingEventData"/> for deserialization. </summary>
-        internal MediaJobOutputCancelingEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputErroredEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputErroredEventData.Serialization.cs
deleted file mode 100644
index ee7d8c142784..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputErroredEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputErroredEventData : IUtf8JsonSerializable, IJsonModel<MediaJobOutputErroredEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputErroredEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputErroredEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputErroredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputErroredEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobOutputErroredEventData IJsonModel<MediaJobOutputErroredEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputErroredEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputErroredEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputErroredEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputErroredEventData DeserializeMediaJobOutputErroredEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobOutput output = default;
-            IReadOnlyDictionary<string, string> jobCorrelationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    output = MediaJobOutput.DeserializeMediaJobOutput(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("jobCorrelationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobCorrelationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputErroredEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputErroredEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputErroredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputErroredEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputErroredEventData IPersistableModel<MediaJobOutputErroredEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputErroredEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputErroredEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputErroredEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputErroredEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobOutputErroredEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputErroredEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputErroredEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputErroredEventData.cs
deleted file mode 100644
index 22535aa75e81..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputErroredEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job output error event data. Schema of the data property of an EventGridEvent
-    /// for a Microsoft.Media.JobOutputErrored event.
-    /// </summary>
-    public partial class MediaJobOutputErroredEventData : MediaJobOutputStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputErroredEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="output"/> or <paramref name="jobCorrelationData"/> is null. </exception>
-        internal MediaJobOutputErroredEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData) : base(previousState, output, jobCorrelationData)
-        {
-            Argument.AssertNotNull(output, nameof(output));
-            Argument.AssertNotNull(jobCorrelationData, nameof(jobCorrelationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputErroredEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutputErroredEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, output, jobCorrelationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputErroredEventData"/> for deserialization. </summary>
-        internal MediaJobOutputErroredEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputFinishedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputFinishedEventData.Serialization.cs
deleted file mode 100644
index 129a88fa4d80..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputFinishedEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputFinishedEventData : IUtf8JsonSerializable, IJsonModel<MediaJobOutputFinishedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputFinishedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputFinishedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputFinishedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobOutputFinishedEventData IJsonModel<MediaJobOutputFinishedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputFinishedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputFinishedEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputFinishedEventData DeserializeMediaJobOutputFinishedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobOutput output = default;
-            IReadOnlyDictionary<string, string> jobCorrelationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    output = MediaJobOutput.DeserializeMediaJobOutput(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("jobCorrelationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobCorrelationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputFinishedEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputFinishedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputFinishedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputFinishedEventData IPersistableModel<MediaJobOutputFinishedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputFinishedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputFinishedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputFinishedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputFinishedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobOutputFinishedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputFinishedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputFinishedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputFinishedEventData.cs
deleted file mode 100644
index 701290e6f1cf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputFinishedEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job output finished event data. Schema of the data property of an
-    /// EventGridEvent for a Microsoft.Media.JobOutputFinished event.
-    /// </summary>
-    public partial class MediaJobOutputFinishedEventData : MediaJobOutputStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputFinishedEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="output"/> or <paramref name="jobCorrelationData"/> is null. </exception>
-        internal MediaJobOutputFinishedEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData) : base(previousState, output, jobCorrelationData)
-        {
-            Argument.AssertNotNull(output, nameof(output));
-            Argument.AssertNotNull(jobCorrelationData, nameof(jobCorrelationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputFinishedEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutputFinishedEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, output, jobCorrelationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputFinishedEventData"/> for deserialization. </summary>
-        internal MediaJobOutputFinishedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProcessingEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProcessingEventData.Serialization.cs
deleted file mode 100644
index c07318cc5eab..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProcessingEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputProcessingEventData : IUtf8JsonSerializable, IJsonModel<MediaJobOutputProcessingEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputProcessingEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputProcessingEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputProcessingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputProcessingEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobOutputProcessingEventData IJsonModel<MediaJobOutputProcessingEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputProcessingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputProcessingEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputProcessingEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputProcessingEventData DeserializeMediaJobOutputProcessingEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobOutput output = default;
-            IReadOnlyDictionary<string, string> jobCorrelationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    output = MediaJobOutput.DeserializeMediaJobOutput(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("jobCorrelationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobCorrelationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputProcessingEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputProcessingEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputProcessingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputProcessingEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputProcessingEventData IPersistableModel<MediaJobOutputProcessingEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputProcessingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputProcessingEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputProcessingEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputProcessingEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobOutputProcessingEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputProcessingEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProcessingEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProcessingEventData.cs
deleted file mode 100644
index 1d4c4de32283..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProcessingEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job output processing event data. Schema of the data property of an
-    /// EventGridEvent for a Microsoft.Media.JobOutputProcessing event.
-    /// </summary>
-    public partial class MediaJobOutputProcessingEventData : MediaJobOutputStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputProcessingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="output"/> or <paramref name="jobCorrelationData"/> is null. </exception>
-        internal MediaJobOutputProcessingEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData) : base(previousState, output, jobCorrelationData)
-        {
-            Argument.AssertNotNull(output, nameof(output));
-            Argument.AssertNotNull(jobCorrelationData, nameof(jobCorrelationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputProcessingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutputProcessingEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, output, jobCorrelationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputProcessingEventData"/> for deserialization. </summary>
-        internal MediaJobOutputProcessingEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProgressEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProgressEventData.Serialization.cs
deleted file mode 100644
index dce247a47310..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProgressEventData.Serialization.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputProgressEventData : IUtf8JsonSerializable, IJsonModel<MediaJobOutputProgressEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputProgressEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputProgressEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputProgressEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputProgressEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Label))
-            {
-                writer.WritePropertyName("label"u8);
-                writer.WriteStringValue(Label);
-            }
-            if (Optional.IsDefined(Progress))
-            {
-                writer.WritePropertyName("progress"u8);
-                writer.WriteNumberValue(Progress.Value);
-            }
-            writer.WritePropertyName("jobCorrelationData"u8);
-            writer.WriteStartObject();
-            foreach (var item in JobCorrelationData)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaJobOutputProgressEventData IJsonModel<MediaJobOutputProgressEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputProgressEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputProgressEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputProgressEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputProgressEventData DeserializeMediaJobOutputProgressEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string label = default;
-            long? progress = default;
-            IReadOnlyDictionary<string, string> jobCorrelationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("label"u8))
-                {
-                    label = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("progress"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    progress = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("jobCorrelationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobCorrelationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputProgressEventData(label, progress, jobCorrelationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputProgressEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputProgressEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputProgressEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputProgressEventData IPersistableModel<MediaJobOutputProgressEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputProgressEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputProgressEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputProgressEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputProgressEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaJobOutputProgressEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputProgressEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProgressEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProgressEventData.cs
deleted file mode 100644
index ea1d37aa0f91..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputProgressEventData.cs
+++ /dev/null
@@ -1,86 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job Output Progress Event Data. Schema of the Data property of an
-    ///   EventGridEvent for a Microsoft.Media.JobOutputProgress event.
-    /// </summary>
-    public partial class MediaJobOutputProgressEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputProgressEventData"/>. </summary>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="jobCorrelationData"/> is null. </exception>
-        internal MediaJobOutputProgressEventData(IReadOnlyDictionary<string, string> jobCorrelationData)
-        {
-            Argument.AssertNotNull(jobCorrelationData, nameof(jobCorrelationData));
-
-            JobCorrelationData = jobCorrelationData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputProgressEventData"/>. </summary>
-        /// <param name="label"> Gets the Job output label. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutputProgressEventData(string label, long? progress, IReadOnlyDictionary<string, string> jobCorrelationData, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Label = label;
-            Progress = progress;
-            JobCorrelationData = jobCorrelationData;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputProgressEventData"/> for deserialization. </summary>
-        internal MediaJobOutputProgressEventData()
-        {
-        }
-
-        /// <summary> Gets the Job output label. </summary>
-        public string Label { get; }
-        /// <summary> Gets the Job output progress. </summary>
-        public long? Progress { get; }
-        /// <summary> Gets the Job correlation data. </summary>
-        public IReadOnlyDictionary<string, string> JobCorrelationData { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputScheduledEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputScheduledEventData.Serialization.cs
deleted file mode 100644
index 46d2415e5d34..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputScheduledEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputScheduledEventData : IUtf8JsonSerializable, IJsonModel<MediaJobOutputScheduledEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputScheduledEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputScheduledEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputScheduledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputScheduledEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobOutputScheduledEventData IJsonModel<MediaJobOutputScheduledEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputScheduledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputScheduledEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputScheduledEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputScheduledEventData DeserializeMediaJobOutputScheduledEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobOutput output = default;
-            IReadOnlyDictionary<string, string> jobCorrelationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    output = MediaJobOutput.DeserializeMediaJobOutput(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("jobCorrelationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobCorrelationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputScheduledEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputScheduledEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputScheduledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputScheduledEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputScheduledEventData IPersistableModel<MediaJobOutputScheduledEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputScheduledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputScheduledEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputScheduledEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputScheduledEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobOutputScheduledEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputScheduledEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputScheduledEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputScheduledEventData.cs
deleted file mode 100644
index a11011667492..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputScheduledEventData.cs
+++ /dev/null
@@ -1,52 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job output scheduled event data. Schema of the data property of an
-    /// EventGridEvent for a Microsoft.Media.JobOutputScheduled event.
-    /// </summary>
-    public partial class MediaJobOutputScheduledEventData : MediaJobOutputStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputScheduledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="output"/> or <paramref name="jobCorrelationData"/> is null. </exception>
-        internal MediaJobOutputScheduledEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData) : base(previousState, output, jobCorrelationData)
-        {
-            Argument.AssertNotNull(output, nameof(output));
-            Argument.AssertNotNull(jobCorrelationData, nameof(jobCorrelationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputScheduledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutputScheduledEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, output, jobCorrelationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputScheduledEventData"/> for deserialization. </summary>
-        internal MediaJobOutputScheduledEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputStateChangeEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputStateChangeEventData.Serialization.cs
deleted file mode 100644
index 7cf2827360e4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputStateChangeEventData.Serialization.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobOutputStateChangeEventData : IUtf8JsonSerializable, IJsonModel<MediaJobOutputStateChangeEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutputStateChangeEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutputStateChangeEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputStateChangeEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputStateChangeEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("previousState"u8);
-            writer.WriteStringValue(PreviousState.ToString());
-            writer.WritePropertyName("output"u8);
-            writer.WriteObjectValue(Output, options);
-            writer.WritePropertyName("jobCorrelationData"u8);
-            writer.WriteStartObject();
-            foreach (var item in JobCorrelationData)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaJobOutputStateChangeEventData IJsonModel<MediaJobOutputStateChangeEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputStateChangeEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutputStateChangeEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutputStateChangeEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobOutputStateChangeEventData DeserializeMediaJobOutputStateChangeEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobOutput output = default;
-            IReadOnlyDictionary<string, string> jobCorrelationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("output"u8))
-                {
-                    output = MediaJobOutput.DeserializeMediaJobOutput(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("jobCorrelationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    jobCorrelationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobOutputStateChangeEventData(previousState, output, jobCorrelationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutputStateChangeEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputStateChangeEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputStateChangeEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutputStateChangeEventData IPersistableModel<MediaJobOutputStateChangeEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutputStateChangeEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutputStateChangeEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutputStateChangeEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutputStateChangeEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaJobOutputStateChangeEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobOutputStateChangeEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputStateChangeEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputStateChangeEventData.cs
deleted file mode 100644
index d647fa5feff2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobOutputStateChangeEventData.cs
+++ /dev/null
@@ -1,103 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Schema of the Data property of an EventGridEvent for a
-    ///   Microsoft.Media.JobOutputStateChange event.
-    /// </summary>
-    public partial class MediaJobOutputStateChangeEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputStateChangeEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="output"/> or <paramref name="jobCorrelationData"/> is null. </exception>
-        internal MediaJobOutputStateChangeEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData)
-        {
-            Argument.AssertNotNull(output, nameof(output));
-            Argument.AssertNotNull(jobCorrelationData, nameof(jobCorrelationData));
-
-            PreviousState = previousState;
-            Output = output;
-            JobCorrelationData = jobCorrelationData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputStateChangeEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="output">
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </param>
-        /// <param name="jobCorrelationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobOutputStateChangeEventData(MediaJobState previousState, MediaJobOutput output, IReadOnlyDictionary<string, string> jobCorrelationData, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            PreviousState = previousState;
-            Output = output;
-            JobCorrelationData = jobCorrelationData;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobOutputStateChangeEventData"/> for deserialization. </summary>
-        internal MediaJobOutputStateChangeEventData()
-        {
-        }
-
-        /// <summary> The previous state of the Job. </summary>
-        public MediaJobState PreviousState { get; }
-        /// <summary>
-        /// Gets the output.
-        /// Please note <see cref="MediaJobOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="MediaJobOutputAsset"/>.
-        /// </summary>
-        public MediaJobOutput Output { get; }
-        /// <summary> Gets the Job correlation data. </summary>
-        public IReadOnlyDictionary<string, string> JobCorrelationData { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobProcessingEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobProcessingEventData.Serialization.cs
deleted file mode 100644
index 093588eafc6b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobProcessingEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobProcessingEventData : IUtf8JsonSerializable, IJsonModel<MediaJobProcessingEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobProcessingEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobProcessingEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobProcessingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobProcessingEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobProcessingEventData IJsonModel<MediaJobProcessingEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobProcessingEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobProcessingEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobProcessingEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobProcessingEventData DeserializeMediaJobProcessingEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobState state = default;
-            IReadOnlyDictionary<string, string> correlationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("correlationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    correlationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobProcessingEventData(previousState, state, correlationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobProcessingEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobProcessingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobProcessingEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobProcessingEventData IPersistableModel<MediaJobProcessingEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobProcessingEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobProcessingEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobProcessingEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobProcessingEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobProcessingEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobProcessingEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobProcessingEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobProcessingEventData.cs
deleted file mode 100644
index 1298b135d442..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobProcessingEventData.cs
+++ /dev/null
@@ -1,43 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job processing event data. Schema of the data property of an EventGridEvent for
-    /// a Microsoft.Media.JobProcessing event.
-    /// </summary>
-    public partial class MediaJobProcessingEventData : MediaJobStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobProcessingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="correlationData"/> is null. </exception>
-        internal MediaJobProcessingEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData) : base(previousState, state, correlationData)
-        {
-            Argument.AssertNotNull(correlationData, nameof(correlationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobProcessingEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobProcessingEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, state, correlationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobProcessingEventData"/> for deserialization. </summary>
-        internal MediaJobProcessingEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobRetry.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobRetry.cs
deleted file mode 100644
index cf01dfb61c9b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobRetry.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Media Job Retry Options. </summary>
-    public readonly partial struct MediaJobRetry : IEquatable<MediaJobRetry>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobRetry"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public MediaJobRetry(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string DoNotRetryValue = "DoNotRetry";
-        private const string MayRetryValue = "MayRetry";
-
-        /// <summary> Issue needs to be investigated and then the job resubmitted with corrections or retried once the underlying issue has been corrected. </summary>
-        public static MediaJobRetry DoNotRetry { get; } = new MediaJobRetry(DoNotRetryValue);
-        /// <summary> Issue may be resolved after waiting for a period of time and resubmitting the same Job. </summary>
-        public static MediaJobRetry MayRetry { get; } = new MediaJobRetry(MayRetryValue);
-        /// <summary> Determines if two <see cref="MediaJobRetry"/> values are the same. </summary>
-        public static bool operator ==(MediaJobRetry left, MediaJobRetry right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="MediaJobRetry"/> values are not the same. </summary>
-        public static bool operator !=(MediaJobRetry left, MediaJobRetry right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="MediaJobRetry"/>. </summary>
-        public static implicit operator MediaJobRetry(string value) => new MediaJobRetry(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is MediaJobRetry other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(MediaJobRetry other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobScheduledEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobScheduledEventData.Serialization.cs
deleted file mode 100644
index 3f381fba4854..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobScheduledEventData.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobScheduledEventData : IUtf8JsonSerializable, IJsonModel<MediaJobScheduledEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobScheduledEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobScheduledEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobScheduledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobScheduledEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobScheduledEventData IJsonModel<MediaJobScheduledEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobScheduledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobScheduledEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobScheduledEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobScheduledEventData DeserializeMediaJobScheduledEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobState state = default;
-            IReadOnlyDictionary<string, string> correlationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("correlationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    correlationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobScheduledEventData(previousState, state, correlationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobScheduledEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobScheduledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobScheduledEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobScheduledEventData IPersistableModel<MediaJobScheduledEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobScheduledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobScheduledEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobScheduledEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobScheduledEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new MediaJobScheduledEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobScheduledEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobScheduledEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobScheduledEventData.cs
deleted file mode 100644
index f7f96abda48f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobScheduledEventData.cs
+++ /dev/null
@@ -1,43 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Job scheduled event data. Schema of the data property of an EventGridEvent for
-    /// a Microsoft.Media.JobScheduled event.
-    /// </summary>
-    public partial class MediaJobScheduledEventData : MediaJobStateChangeEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="MediaJobScheduledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="correlationData"/> is null. </exception>
-        internal MediaJobScheduledEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData) : base(previousState, state, correlationData)
-        {
-            Argument.AssertNotNull(correlationData, nameof(correlationData));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobScheduledEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobScheduledEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(previousState, state, correlationData, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobScheduledEventData"/> for deserialization. </summary>
-        internal MediaJobScheduledEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobState.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobState.cs
deleted file mode 100644
index dafd83fecbd1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobState.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> State of a Media Job. </summary>
-    public readonly partial struct MediaJobState : IEquatable<MediaJobState>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobState"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public MediaJobState(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string CanceledValue = "Canceled";
-        private const string CancelingValue = "Canceling";
-        private const string ErrorValue = "Error";
-        private const string FinishedValue = "Finished";
-        private const string ProcessingValue = "Processing";
-        private const string QueuedValue = "Queued";
-        private const string ScheduledValue = "Scheduled";
-
-        /// <summary> The job was canceled. This is a final state for the job. </summary>
-        public static MediaJobState Canceled { get; } = new MediaJobState(CanceledValue);
-        /// <summary> The job is in the process of being canceled. This is a transient state for the job. </summary>
-        public static MediaJobState Canceling { get; } = new MediaJobState(CancelingValue);
-        /// <summary> The job has encountered an error. This is a final state for the job. </summary>
-        public static MediaJobState Error { get; } = new MediaJobState(ErrorValue);
-        /// <summary> The job is finished. This is a final state for the job. </summary>
-        public static MediaJobState Finished { get; } = new MediaJobState(FinishedValue);
-        /// <summary> The job is processing. This is a transient state for the job. </summary>
-        public static MediaJobState Processing { get; } = new MediaJobState(ProcessingValue);
-        /// <summary> The job is in a queued state, waiting for resources to become available. This is a transient state. </summary>
-        public static MediaJobState Queued { get; } = new MediaJobState(QueuedValue);
-        /// <summary> The job is being scheduled to run on an available resource. This is a transient state, between queued and processing states. </summary>
-        public static MediaJobState Scheduled { get; } = new MediaJobState(ScheduledValue);
-        /// <summary> Determines if two <see cref="MediaJobState"/> values are the same. </summary>
-        public static bool operator ==(MediaJobState left, MediaJobState right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="MediaJobState"/> values are not the same. </summary>
-        public static bool operator !=(MediaJobState left, MediaJobState right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="MediaJobState"/>. </summary>
-        public static implicit operator MediaJobState(string value) => new MediaJobState(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is MediaJobState other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(MediaJobState other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobStateChangeEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobStateChangeEventData.Serialization.cs
deleted file mode 100644
index 65b844ceb28b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobStateChangeEventData.Serialization.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaJobStateChangeEventData : IUtf8JsonSerializable, IJsonModel<MediaJobStateChangeEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobStateChangeEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobStateChangeEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobStateChangeEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobStateChangeEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("previousState"u8);
-            writer.WriteStringValue(PreviousState.ToString());
-            writer.WritePropertyName("state"u8);
-            writer.WriteStringValue(State.ToString());
-            writer.WritePropertyName("correlationData"u8);
-            writer.WriteStartObject();
-            foreach (var item in CorrelationData)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaJobStateChangeEventData IJsonModel<MediaJobStateChangeEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobStateChangeEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobStateChangeEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobStateChangeEventData(document.RootElement, options);
-        }
-
-        internal static MediaJobStateChangeEventData DeserializeMediaJobStateChangeEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            MediaJobState previousState = default;
-            MediaJobState state = default;
-            IReadOnlyDictionary<string, string> correlationData = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("previousState"u8))
-                {
-                    previousState = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("correlationData"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    correlationData = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaJobStateChangeEventData(previousState, state, correlationData, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobStateChangeEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobStateChangeEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobStateChangeEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobStateChangeEventData IPersistableModel<MediaJobStateChangeEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobStateChangeEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobStateChangeEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobStateChangeEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobStateChangeEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaJobStateChangeEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaJobStateChangeEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobStateChangeEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobStateChangeEventData.cs
deleted file mode 100644
index ce4898df35b8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaJobStateChangeEventData.cs
+++ /dev/null
@@ -1,90 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Schema of the Data property of an EventGridEvent for a
-    ///   Microsoft.Media.JobStateChange event.
-    /// </summary>
-    public partial class MediaJobStateChangeEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobStateChangeEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="correlationData"/> is null. </exception>
-        internal MediaJobStateChangeEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData)
-        {
-            Argument.AssertNotNull(correlationData, nameof(correlationData));
-
-            PreviousState = previousState;
-            State = state;
-            CorrelationData = correlationData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobStateChangeEventData"/>. </summary>
-        /// <param name="previousState"> The previous state of the Job. </param>
-        /// <param name="state"> The new state of the Job. </param>
-        /// <param name="correlationData"> Gets the Job correlation data. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaJobStateChangeEventData(MediaJobState previousState, MediaJobState state, IReadOnlyDictionary<string, string> correlationData, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            PreviousState = previousState;
-            State = state;
-            CorrelationData = correlationData;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaJobStateChangeEventData"/> for deserialization. </summary>
-        internal MediaJobStateChangeEventData()
-        {
-        }
-
-        /// <summary> The previous state of the Job. </summary>
-        public MediaJobState PreviousState { get; }
-        /// <summary> The new state of the Job. </summary>
-        public MediaJobState State { get; }
-        /// <summary> Gets the Job correlation data. </summary>
-        public IReadOnlyDictionary<string, string> CorrelationData { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventChannelArchiveHeartbeatEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventChannelArchiveHeartbeatEventData.Serialization.cs
deleted file mode 100644
index 8e6b9507b93a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventChannelArchiveHeartbeatEventData.Serialization.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventChannelArchiveHeartbeatEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventChannelArchiveHeartbeatEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventChannelArchiveHeartbeatEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventChannelArchiveHeartbeatEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventChannelArchiveHeartbeatEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventChannelArchiveHeartbeatEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("channelLatencyMs"u8);
-            writer.WriteStringValue(ChannelLatencyMs);
-            writer.WritePropertyName("latencyResultCode"u8);
-            writer.WriteStringValue(LatencyResultCode);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventChannelArchiveHeartbeatEventData IJsonModel<MediaLiveEventChannelArchiveHeartbeatEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventChannelArchiveHeartbeatEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventChannelArchiveHeartbeatEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventChannelArchiveHeartbeatEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventChannelArchiveHeartbeatEventData DeserializeMediaLiveEventChannelArchiveHeartbeatEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string channelLatencyMs = default;
-            string latencyResultCode = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("channelLatencyMs"u8))
-                {
-                    channelLatencyMs = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("latencyResultCode"u8))
-                {
-                    latencyResultCode = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventChannelArchiveHeartbeatEventData(channelLatencyMs, latencyResultCode, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventChannelArchiveHeartbeatEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventChannelArchiveHeartbeatEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventChannelArchiveHeartbeatEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventChannelArchiveHeartbeatEventData IPersistableModel<MediaLiveEventChannelArchiveHeartbeatEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventChannelArchiveHeartbeatEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventChannelArchiveHeartbeatEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventChannelArchiveHeartbeatEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventChannelArchiveHeartbeatEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventChannelArchiveHeartbeatEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventChannelArchiveHeartbeatEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventChannelArchiveHeartbeatEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventChannelArchiveHeartbeatEventData.cs
deleted file mode 100644
index 1a2e1674b510..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventChannelArchiveHeartbeatEventData.cs
+++ /dev/null
@@ -1,82 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Channel Archive heartbeat event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventChannelArchiveHeartbeat event. </summary>
-    public partial class MediaLiveEventChannelArchiveHeartbeatEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventChannelArchiveHeartbeatEventData"/>. </summary>
-        /// <param name="channelLatencyMs"> Gets the channel latency in ms. </param>
-        /// <param name="latencyResultCode"> Gets the latency result code. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="channelLatencyMs"/> or <paramref name="latencyResultCode"/> is null. </exception>
-        internal MediaLiveEventChannelArchiveHeartbeatEventData(string channelLatencyMs, string latencyResultCode)
-        {
-            Argument.AssertNotNull(channelLatencyMs, nameof(channelLatencyMs));
-            Argument.AssertNotNull(latencyResultCode, nameof(latencyResultCode));
-
-            ChannelLatencyMs = channelLatencyMs;
-            LatencyResultCode = latencyResultCode;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventChannelArchiveHeartbeatEventData"/>. </summary>
-        /// <param name="channelLatencyMs"> Gets the channel latency in ms. </param>
-        /// <param name="latencyResultCode"> Gets the latency result code. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventChannelArchiveHeartbeatEventData(string channelLatencyMs, string latencyResultCode, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ChannelLatencyMs = channelLatencyMs;
-            LatencyResultCode = latencyResultCode;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventChannelArchiveHeartbeatEventData"/> for deserialization. </summary>
-        internal MediaLiveEventChannelArchiveHeartbeatEventData()
-        {
-        }
-
-        /// <summary> Gets the channel latency in ms. </summary>
-        public string ChannelLatencyMs { get; }
-        /// <summary> Gets the latency result code. </summary>
-        public string LatencyResultCode { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventConnectionRejectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventConnectionRejectedEventData.Serialization.cs
deleted file mode 100644
index 4fb52f66dce3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventConnectionRejectedEventData.Serialization.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventConnectionRejectedEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventConnectionRejectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventConnectionRejectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventConnectionRejectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventConnectionRejectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventConnectionRejectedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(IngestUrl))
-            {
-                writer.WritePropertyName("ingestUrl"u8);
-                writer.WriteStringValue(IngestUrl);
-            }
-            if (Optional.IsDefined(StreamId))
-            {
-                writer.WritePropertyName("streamId"u8);
-                writer.WriteStringValue(StreamId);
-            }
-            if (Optional.IsDefined(EncoderIp))
-            {
-                writer.WritePropertyName("encoderIp"u8);
-                writer.WriteStringValue(EncoderIp);
-            }
-            if (Optional.IsDefined(EncoderPort))
-            {
-                writer.WritePropertyName("encoderPort"u8);
-                writer.WriteStringValue(EncoderPort);
-            }
-            if (Optional.IsDefined(ResultCode))
-            {
-                writer.WritePropertyName("resultCode"u8);
-                writer.WriteStringValue(ResultCode);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventConnectionRejectedEventData IJsonModel<MediaLiveEventConnectionRejectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventConnectionRejectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventConnectionRejectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventConnectionRejectedEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventConnectionRejectedEventData DeserializeMediaLiveEventConnectionRejectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string ingestUrl = default;
-            string streamId = default;
-            string encoderIp = default;
-            string encoderPort = default;
-            string resultCode = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("ingestUrl"u8))
-                {
-                    ingestUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("streamId"u8))
-                {
-                    streamId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("encoderIp"u8))
-                {
-                    encoderIp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("encoderPort"u8))
-                {
-                    encoderPort = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resultCode"u8))
-                {
-                    resultCode = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventConnectionRejectedEventData(
-                ingestUrl,
-                streamId,
-                encoderIp,
-                encoderPort,
-                resultCode,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventConnectionRejectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventConnectionRejectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventConnectionRejectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventConnectionRejectedEventData IPersistableModel<MediaLiveEventConnectionRejectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventConnectionRejectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventConnectionRejectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventConnectionRejectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventConnectionRejectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventConnectionRejectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventConnectionRejectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventConnectionRejectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventConnectionRejectedEventData.cs
deleted file mode 100644
index 9e86f61c5768..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventConnectionRejectedEventData.cs
+++ /dev/null
@@ -1,81 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Encoder connection rejected event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventConnectionRejected event. </summary>
-    public partial class MediaLiveEventConnectionRejectedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventConnectionRejectedEventData"/>. </summary>
-        internal MediaLiveEventConnectionRejectedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventConnectionRejectedEventData"/>. </summary>
-        /// <param name="ingestUrl"> Gets the ingest URL provided by the live event. </param>
-        /// <param name="streamId"> Gets the stream Id. </param>
-        /// <param name="encoderIp"> Gets the remote IP. </param>
-        /// <param name="encoderPort"> Gets the remote port. </param>
-        /// <param name="resultCode"> Gets the result code. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventConnectionRejectedEventData(string ingestUrl, string streamId, string encoderIp, string encoderPort, string resultCode, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            IngestUrl = ingestUrl;
-            StreamId = streamId;
-            EncoderIp = encoderIp;
-            EncoderPort = encoderPort;
-            ResultCode = resultCode;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the ingest URL provided by the live event. </summary>
-        public string IngestUrl { get; }
-        /// <summary> Gets the stream Id. </summary>
-        public string StreamId { get; }
-        /// <summary> Gets the remote IP. </summary>
-        public string EncoderIp { get; }
-        /// <summary> Gets the remote port. </summary>
-        public string EncoderPort { get; }
-        /// <summary> Gets the result code. </summary>
-        public string ResultCode { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderConnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderConnectedEventData.Serialization.cs
deleted file mode 100644
index 8caba084c648..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderConnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventEncoderConnectedEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventEncoderConnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventEncoderConnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventEncoderConnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventEncoderConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventEncoderConnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(IngestUrl))
-            {
-                writer.WritePropertyName("ingestUrl"u8);
-                writer.WriteStringValue(IngestUrl);
-            }
-            if (Optional.IsDefined(StreamId))
-            {
-                writer.WritePropertyName("streamId"u8);
-                writer.WriteStringValue(StreamId);
-            }
-            if (Optional.IsDefined(EncoderIp))
-            {
-                writer.WritePropertyName("encoderIp"u8);
-                writer.WriteStringValue(EncoderIp);
-            }
-            if (Optional.IsDefined(EncoderPort))
-            {
-                writer.WritePropertyName("encoderPort"u8);
-                writer.WriteStringValue(EncoderPort);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventEncoderConnectedEventData IJsonModel<MediaLiveEventEncoderConnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventEncoderConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventEncoderConnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventEncoderConnectedEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventEncoderConnectedEventData DeserializeMediaLiveEventEncoderConnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string ingestUrl = default;
-            string streamId = default;
-            string encoderIp = default;
-            string encoderPort = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("ingestUrl"u8))
-                {
-                    ingestUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("streamId"u8))
-                {
-                    streamId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("encoderIp"u8))
-                {
-                    encoderIp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("encoderPort"u8))
-                {
-                    encoderPort = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventEncoderConnectedEventData(ingestUrl, streamId, encoderIp, encoderPort, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventEncoderConnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventEncoderConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventEncoderConnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventEncoderConnectedEventData IPersistableModel<MediaLiveEventEncoderConnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventEncoderConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventEncoderConnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventEncoderConnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventEncoderConnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventEncoderConnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventEncoderConnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderConnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderConnectedEventData.cs
deleted file mode 100644
index ae72ea53ee7d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderConnectedEventData.cs
+++ /dev/null
@@ -1,77 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Encoder connect event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventEncoderConnected event. </summary>
-    public partial class MediaLiveEventEncoderConnectedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventEncoderConnectedEventData"/>. </summary>
-        internal MediaLiveEventEncoderConnectedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventEncoderConnectedEventData"/>. </summary>
-        /// <param name="ingestUrl"> Gets the ingest URL provided by the live event. </param>
-        /// <param name="streamId"> Gets the stream Id. </param>
-        /// <param name="encoderIp"> Gets the remote IP. </param>
-        /// <param name="encoderPort"> Gets the remote port. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventEncoderConnectedEventData(string ingestUrl, string streamId, string encoderIp, string encoderPort, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            IngestUrl = ingestUrl;
-            StreamId = streamId;
-            EncoderIp = encoderIp;
-            EncoderPort = encoderPort;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the ingest URL provided by the live event. </summary>
-        public string IngestUrl { get; }
-        /// <summary> Gets the stream Id. </summary>
-        public string StreamId { get; }
-        /// <summary> Gets the remote IP. </summary>
-        public string EncoderIp { get; }
-        /// <summary> Gets the remote port. </summary>
-        public string EncoderPort { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderDisconnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderDisconnectedEventData.Serialization.cs
deleted file mode 100644
index a568208756a4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderDisconnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventEncoderDisconnectedEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventEncoderDisconnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventEncoderDisconnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventEncoderDisconnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventEncoderDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventEncoderDisconnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(IngestUrl))
-            {
-                writer.WritePropertyName("ingestUrl"u8);
-                writer.WriteStringValue(IngestUrl);
-            }
-            if (Optional.IsDefined(StreamId))
-            {
-                writer.WritePropertyName("streamId"u8);
-                writer.WriteStringValue(StreamId);
-            }
-            if (Optional.IsDefined(EncoderIp))
-            {
-                writer.WritePropertyName("encoderIp"u8);
-                writer.WriteStringValue(EncoderIp);
-            }
-            if (Optional.IsDefined(EncoderPort))
-            {
-                writer.WritePropertyName("encoderPort"u8);
-                writer.WriteStringValue(EncoderPort);
-            }
-            if (Optional.IsDefined(ResultCode))
-            {
-                writer.WritePropertyName("resultCode"u8);
-                writer.WriteStringValue(ResultCode);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventEncoderDisconnectedEventData IJsonModel<MediaLiveEventEncoderDisconnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventEncoderDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventEncoderDisconnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventEncoderDisconnectedEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventEncoderDisconnectedEventData DeserializeMediaLiveEventEncoderDisconnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string ingestUrl = default;
-            string streamId = default;
-            string encoderIp = default;
-            string encoderPort = default;
-            string resultCode = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("ingestUrl"u8))
-                {
-                    ingestUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("streamId"u8))
-                {
-                    streamId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("encoderIp"u8))
-                {
-                    encoderIp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("encoderPort"u8))
-                {
-                    encoderPort = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resultCode"u8))
-                {
-                    resultCode = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventEncoderDisconnectedEventData(
-                ingestUrl,
-                streamId,
-                encoderIp,
-                encoderPort,
-                resultCode,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventEncoderDisconnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventEncoderDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventEncoderDisconnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventEncoderDisconnectedEventData IPersistableModel<MediaLiveEventEncoderDisconnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventEncoderDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventEncoderDisconnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventEncoderDisconnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventEncoderDisconnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventEncoderDisconnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventEncoderDisconnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderDisconnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderDisconnectedEventData.cs
deleted file mode 100644
index 93e701277824..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventEncoderDisconnectedEventData.cs
+++ /dev/null
@@ -1,81 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Encoder disconnected event data. Schema of the Data property of an EventGridEvent for a Microsoft.Media.LiveEventEncoderDisconnected event. </summary>
-    public partial class MediaLiveEventEncoderDisconnectedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventEncoderDisconnectedEventData"/>. </summary>
-        internal MediaLiveEventEncoderDisconnectedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventEncoderDisconnectedEventData"/>. </summary>
-        /// <param name="ingestUrl"> Gets the ingest URL provided by the live event. </param>
-        /// <param name="streamId"> Gets the stream Id. </param>
-        /// <param name="encoderIp"> Gets the remote IP. </param>
-        /// <param name="encoderPort"> Gets the remote port. </param>
-        /// <param name="resultCode"> Gets the result code. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventEncoderDisconnectedEventData(string ingestUrl, string streamId, string encoderIp, string encoderPort, string resultCode, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            IngestUrl = ingestUrl;
-            StreamId = streamId;
-            EncoderIp = encoderIp;
-            EncoderPort = encoderPort;
-            ResultCode = resultCode;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the ingest URL provided by the live event. </summary>
-        public string IngestUrl { get; }
-        /// <summary> Gets the stream Id. </summary>
-        public string StreamId { get; }
-        /// <summary> Gets the remote IP. </summary>
-        public string EncoderIp { get; }
-        /// <summary> Gets the remote port. </summary>
-        public string EncoderPort { get; }
-        /// <summary> Gets the result code. </summary>
-        public string ResultCode { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingDataChunkDroppedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingDataChunkDroppedEventData.Serialization.cs
deleted file mode 100644
index 4692cd59910e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingDataChunkDroppedEventData.Serialization.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventIncomingDataChunkDroppedEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventIncomingDataChunkDroppedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventIncomingDataChunkDroppedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventIncomingDataChunkDroppedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingDataChunkDroppedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIncomingDataChunkDroppedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Timestamp))
-            {
-                writer.WritePropertyName("timestamp"u8);
-                writer.WriteStringValue(Timestamp);
-            }
-            if (Optional.IsDefined(TrackType))
-            {
-                writer.WritePropertyName("trackType"u8);
-                writer.WriteStringValue(TrackType);
-            }
-            if (Optional.IsDefined(Bitrate))
-            {
-                writer.WritePropertyName("bitrate"u8);
-                writer.WriteNumberValue(Bitrate.Value);
-            }
-            if (Optional.IsDefined(ResultCode))
-            {
-                writer.WritePropertyName("resultCode"u8);
-                writer.WriteStringValue(ResultCode);
-            }
-            if (Optional.IsDefined(TrackName))
-            {
-                writer.WritePropertyName("trackName"u8);
-                writer.WriteStringValue(TrackName);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventIncomingDataChunkDroppedEventData IJsonModel<MediaLiveEventIncomingDataChunkDroppedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingDataChunkDroppedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIncomingDataChunkDroppedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventIncomingDataChunkDroppedEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventIncomingDataChunkDroppedEventData DeserializeMediaLiveEventIncomingDataChunkDroppedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string timestamp = default;
-            string trackType = default;
-            long? bitrate = default;
-            string resultCode = default;
-            string trackName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("trackType"u8))
-                {
-                    trackType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("bitrate"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    bitrate = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("resultCode"u8))
-                {
-                    resultCode = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("trackName"u8))
-                {
-                    trackName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventIncomingDataChunkDroppedEventData(
-                timestamp,
-                trackType,
-                bitrate,
-                resultCode,
-                trackName,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventIncomingDataChunkDroppedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingDataChunkDroppedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIncomingDataChunkDroppedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventIncomingDataChunkDroppedEventData IPersistableModel<MediaLiveEventIncomingDataChunkDroppedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingDataChunkDroppedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventIncomingDataChunkDroppedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIncomingDataChunkDroppedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventIncomingDataChunkDroppedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventIncomingDataChunkDroppedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventIncomingDataChunkDroppedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingDataChunkDroppedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingDataChunkDroppedEventData.cs
deleted file mode 100644
index c12a9ad19eb9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingDataChunkDroppedEventData.cs
+++ /dev/null
@@ -1,81 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Ingest fragment dropped event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventIncomingDataChunkDropped event. </summary>
-    public partial class MediaLiveEventIncomingDataChunkDroppedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIncomingDataChunkDroppedEventData"/>. </summary>
-        internal MediaLiveEventIncomingDataChunkDroppedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIncomingDataChunkDroppedEventData"/>. </summary>
-        /// <param name="timestamp"> Gets the timestamp of the data chunk dropped. </param>
-        /// <param name="trackType"> Gets the type of the track (Audio / Video). </param>
-        /// <param name="bitrate"> Gets the bitrate of the track. </param>
-        /// <param name="resultCode"> Gets the result code for fragment drop operation. </param>
-        /// <param name="trackName"> Gets the name of the track for which fragment is dropped. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventIncomingDataChunkDroppedEventData(string timestamp, string trackType, long? bitrate, string resultCode, string trackName, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            TrackType = trackType;
-            Bitrate = bitrate;
-            ResultCode = resultCode;
-            TrackName = trackName;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the timestamp of the data chunk dropped. </summary>
-        public string Timestamp { get; }
-        /// <summary> Gets the type of the track (Audio / Video). </summary>
-        public string TrackType { get; }
-        /// <summary> Gets the bitrate of the track. </summary>
-        public long? Bitrate { get; }
-        /// <summary> Gets the result code for fragment drop operation. </summary>
-        public string ResultCode { get; }
-        /// <summary> Gets the name of the track for which fragment is dropped. </summary>
-        public string TrackName { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamReceivedEventData.Serialization.cs
deleted file mode 100644
index be42947c0456..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamReceivedEventData.Serialization.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventIncomingStreamReceivedEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventIncomingStreamReceivedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventIncomingStreamReceivedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventIncomingStreamReceivedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingStreamReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIncomingStreamReceivedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(IngestUrl))
-            {
-                writer.WritePropertyName("ingestUrl"u8);
-                writer.WriteStringValue(IngestUrl);
-            }
-            if (Optional.IsDefined(TrackType))
-            {
-                writer.WritePropertyName("trackType"u8);
-                writer.WriteStringValue(TrackType);
-            }
-            if (Optional.IsDefined(TrackName))
-            {
-                writer.WritePropertyName("trackName"u8);
-                writer.WriteStringValue(TrackName);
-            }
-            if (Optional.IsDefined(Bitrate))
-            {
-                writer.WritePropertyName("bitrate"u8);
-                writer.WriteNumberValue(Bitrate.Value);
-            }
-            if (Optional.IsDefined(EncoderIp))
-            {
-                writer.WritePropertyName("encoderIp"u8);
-                writer.WriteStringValue(EncoderIp);
-            }
-            if (Optional.IsDefined(EncoderPort))
-            {
-                writer.WritePropertyName("encoderPort"u8);
-                writer.WriteStringValue(EncoderPort);
-            }
-            if (Optional.IsDefined(Timestamp))
-            {
-                writer.WritePropertyName("timestamp"u8);
-                writer.WriteStringValue(Timestamp);
-            }
-            if (Optional.IsDefined(Duration))
-            {
-                writer.WritePropertyName("duration"u8);
-                writer.WriteStringValue(Duration);
-            }
-            if (Optional.IsDefined(Timescale))
-            {
-                writer.WritePropertyName("timescale"u8);
-                writer.WriteStringValue(Timescale);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventIncomingStreamReceivedEventData IJsonModel<MediaLiveEventIncomingStreamReceivedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingStreamReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIncomingStreamReceivedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventIncomingStreamReceivedEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventIncomingStreamReceivedEventData DeserializeMediaLiveEventIncomingStreamReceivedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string ingestUrl = default;
-            string trackType = default;
-            string trackName = default;
-            long? bitrate = default;
-            string encoderIp = default;
-            string encoderPort = default;
-            string timestamp = default;
-            string duration = default;
-            string timescale = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("ingestUrl"u8))
-                {
-                    ingestUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("trackType"u8))
-                {
-                    trackType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("trackName"u8))
-                {
-                    trackName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("bitrate"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    bitrate = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("encoderIp"u8))
-                {
-                    encoderIp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("encoderPort"u8))
-                {
-                    encoderPort = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("duration"u8))
-                {
-                    duration = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timescale"u8))
-                {
-                    timescale = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventIncomingStreamReceivedEventData(
-                ingestUrl,
-                trackType,
-                trackName,
-                bitrate,
-                encoderIp,
-                encoderPort,
-                timestamp,
-                duration,
-                timescale,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventIncomingStreamReceivedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingStreamReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIncomingStreamReceivedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventIncomingStreamReceivedEventData IPersistableModel<MediaLiveEventIncomingStreamReceivedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingStreamReceivedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventIncomingStreamReceivedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIncomingStreamReceivedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventIncomingStreamReceivedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventIncomingStreamReceivedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventIncomingStreamReceivedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamReceivedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamReceivedEventData.cs
deleted file mode 100644
index c16535f3a93b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamReceivedEventData.cs
+++ /dev/null
@@ -1,97 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Encoder connect event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventIncomingStreamReceived event. </summary>
-    public partial class MediaLiveEventIncomingStreamReceivedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIncomingStreamReceivedEventData"/>. </summary>
-        internal MediaLiveEventIncomingStreamReceivedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIncomingStreamReceivedEventData"/>. </summary>
-        /// <param name="ingestUrl"> Gets the ingest URL provided by the live event. </param>
-        /// <param name="trackType"> Gets the type of the track (Audio / Video). </param>
-        /// <param name="trackName"> Gets the track name. </param>
-        /// <param name="bitrate"> Gets the bitrate of the track. </param>
-        /// <param name="encoderIp"> Gets the remote IP. </param>
-        /// <param name="encoderPort"> Gets the remote port. </param>
-        /// <param name="timestamp"> Gets the first timestamp of the data chunk received. </param>
-        /// <param name="duration"> Gets the duration of the first data chunk. </param>
-        /// <param name="timescale"> Gets the timescale in which timestamp is represented. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventIncomingStreamReceivedEventData(string ingestUrl, string trackType, string trackName, long? bitrate, string encoderIp, string encoderPort, string timestamp, string duration, string timescale, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            IngestUrl = ingestUrl;
-            TrackType = trackType;
-            TrackName = trackName;
-            Bitrate = bitrate;
-            EncoderIp = encoderIp;
-            EncoderPort = encoderPort;
-            Timestamp = timestamp;
-            Duration = duration;
-            Timescale = timescale;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the ingest URL provided by the live event. </summary>
-        public string IngestUrl { get; }
-        /// <summary> Gets the type of the track (Audio / Video). </summary>
-        public string TrackType { get; }
-        /// <summary> Gets the track name. </summary>
-        public string TrackName { get; }
-        /// <summary> Gets the bitrate of the track. </summary>
-        public long? Bitrate { get; }
-        /// <summary> Gets the remote IP. </summary>
-        public string EncoderIp { get; }
-        /// <summary> Gets the remote port. </summary>
-        public string EncoderPort { get; }
-        /// <summary> Gets the first timestamp of the data chunk received. </summary>
-        public string Timestamp { get; }
-        /// <summary> Gets the duration of the first data chunk. </summary>
-        public string Duration { get; }
-        /// <summary> Gets the timescale in which timestamp is represented. </summary>
-        public string Timescale { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamsOutOfSyncEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamsOutOfSyncEventData.Serialization.cs
deleted file mode 100644
index dc5a7de96c8d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamsOutOfSyncEventData.Serialization.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventIncomingStreamsOutOfSyncEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIncomingStreamsOutOfSyncEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(MinLastTimestamp))
-            {
-                writer.WritePropertyName("minLastTimestamp"u8);
-                writer.WriteStringValue(MinLastTimestamp);
-            }
-            if (Optional.IsDefined(TypeOfStreamWithMinLastTimestamp))
-            {
-                writer.WritePropertyName("typeOfStreamWithMinLastTimestamp"u8);
-                writer.WriteStringValue(TypeOfStreamWithMinLastTimestamp);
-            }
-            if (Optional.IsDefined(MaxLastTimestamp))
-            {
-                writer.WritePropertyName("maxLastTimestamp"u8);
-                writer.WriteStringValue(MaxLastTimestamp);
-            }
-            if (Optional.IsDefined(TypeOfStreamWithMaxLastTimestamp))
-            {
-                writer.WritePropertyName("typeOfStreamWithMaxLastTimestamp"u8);
-                writer.WriteStringValue(TypeOfStreamWithMaxLastTimestamp);
-            }
-            if (Optional.IsDefined(TimescaleOfMinLastTimestamp))
-            {
-                writer.WritePropertyName("timescaleOfMinLastTimestamp"u8);
-                writer.WriteStringValue(TimescaleOfMinLastTimestamp);
-            }
-            if (Optional.IsDefined(TimescaleOfMaxLastTimestamp))
-            {
-                writer.WritePropertyName("timescaleOfMaxLastTimestamp"u8);
-                writer.WriteStringValue(TimescaleOfMaxLastTimestamp);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventIncomingStreamsOutOfSyncEventData IJsonModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIncomingStreamsOutOfSyncEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventIncomingStreamsOutOfSyncEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventIncomingStreamsOutOfSyncEventData DeserializeMediaLiveEventIncomingStreamsOutOfSyncEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string minLastTimestamp = default;
-            string typeOfStreamWithMinLastTimestamp = default;
-            string maxLastTimestamp = default;
-            string typeOfStreamWithMaxLastTimestamp = default;
-            string timescaleOfMinLastTimestamp = default;
-            string timescaleOfMaxLastTimestamp = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("minLastTimestamp"u8))
-                {
-                    minLastTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("typeOfStreamWithMinLastTimestamp"u8))
-                {
-                    typeOfStreamWithMinLastTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("maxLastTimestamp"u8))
-                {
-                    maxLastTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("typeOfStreamWithMaxLastTimestamp"u8))
-                {
-                    typeOfStreamWithMaxLastTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timescaleOfMinLastTimestamp"u8))
-                {
-                    timescaleOfMinLastTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timescaleOfMaxLastTimestamp"u8))
-                {
-                    timescaleOfMaxLastTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventIncomingStreamsOutOfSyncEventData(
-                minLastTimestamp,
-                typeOfStreamWithMinLastTimestamp,
-                maxLastTimestamp,
-                typeOfStreamWithMaxLastTimestamp,
-                timescaleOfMinLastTimestamp,
-                timescaleOfMaxLastTimestamp,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIncomingStreamsOutOfSyncEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventIncomingStreamsOutOfSyncEventData IPersistableModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventIncomingStreamsOutOfSyncEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIncomingStreamsOutOfSyncEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventIncomingStreamsOutOfSyncEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventIncomingStreamsOutOfSyncEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventIncomingStreamsOutOfSyncEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamsOutOfSyncEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamsOutOfSyncEventData.cs
deleted file mode 100644
index 48d04136a2fd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingStreamsOutOfSyncEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Incoming streams out of sync event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventIncomingStreamsOutOfSync event. </summary>
-    public partial class MediaLiveEventIncomingStreamsOutOfSyncEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIncomingStreamsOutOfSyncEventData"/>. </summary>
-        internal MediaLiveEventIncomingStreamsOutOfSyncEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIncomingStreamsOutOfSyncEventData"/>. </summary>
-        /// <param name="minLastTimestamp"> Gets the minimum last timestamp received. </param>
-        /// <param name="typeOfStreamWithMinLastTimestamp"> Gets the type of stream with minimum last timestamp. </param>
-        /// <param name="maxLastTimestamp"> Gets the maximum timestamp among all the tracks (audio or video). </param>
-        /// <param name="typeOfStreamWithMaxLastTimestamp"> Gets the type of stream with maximum last timestamp. </param>
-        /// <param name="timescaleOfMinLastTimestamp"> Gets the timescale in which \"MinLastTimestamp\" is represented. </param>
-        /// <param name="timescaleOfMaxLastTimestamp"> Gets the timescale in which \"MaxLastTimestamp\" is represented. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventIncomingStreamsOutOfSyncEventData(string minLastTimestamp, string typeOfStreamWithMinLastTimestamp, string maxLastTimestamp, string typeOfStreamWithMaxLastTimestamp, string timescaleOfMinLastTimestamp, string timescaleOfMaxLastTimestamp, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            MinLastTimestamp = minLastTimestamp;
-            TypeOfStreamWithMinLastTimestamp = typeOfStreamWithMinLastTimestamp;
-            MaxLastTimestamp = maxLastTimestamp;
-            TypeOfStreamWithMaxLastTimestamp = typeOfStreamWithMaxLastTimestamp;
-            TimescaleOfMinLastTimestamp = timescaleOfMinLastTimestamp;
-            TimescaleOfMaxLastTimestamp = timescaleOfMaxLastTimestamp;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the minimum last timestamp received. </summary>
-        public string MinLastTimestamp { get; }
-        /// <summary> Gets the type of stream with minimum last timestamp. </summary>
-        public string TypeOfStreamWithMinLastTimestamp { get; }
-        /// <summary> Gets the maximum timestamp among all the tracks (audio or video). </summary>
-        public string MaxLastTimestamp { get; }
-        /// <summary> Gets the type of stream with maximum last timestamp. </summary>
-        public string TypeOfStreamWithMaxLastTimestamp { get; }
-        /// <summary> Gets the timescale in which \"MinLastTimestamp\" is represented. </summary>
-        public string TimescaleOfMinLastTimestamp { get; }
-        /// <summary> Gets the timescale in which \"MaxLastTimestamp\" is represented. </summary>
-        public string TimescaleOfMaxLastTimestamp { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.Serialization.cs
deleted file mode 100644
index cdf63959dbb9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.Serialization.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventIncomingVideoStreamsOutOfSyncEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIncomingVideoStreamsOutOfSyncEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(FirstTimestamp))
-            {
-                writer.WritePropertyName("firstTimestamp"u8);
-                writer.WriteStringValue(FirstTimestamp);
-            }
-            if (Optional.IsDefined(FirstDuration))
-            {
-                writer.WritePropertyName("firstDuration"u8);
-                writer.WriteStringValue(FirstDuration);
-            }
-            if (Optional.IsDefined(SecondTimestamp))
-            {
-                writer.WritePropertyName("secondTimestamp"u8);
-                writer.WriteStringValue(SecondTimestamp);
-            }
-            if (Optional.IsDefined(SecondDuration))
-            {
-                writer.WritePropertyName("secondDuration"u8);
-                writer.WriteStringValue(SecondDuration);
-            }
-            if (Optional.IsDefined(Timescale))
-            {
-                writer.WritePropertyName("timescale"u8);
-                writer.WriteStringValue(Timescale);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventIncomingVideoStreamsOutOfSyncEventData IJsonModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIncomingVideoStreamsOutOfSyncEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventIncomingVideoStreamsOutOfSyncEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventIncomingVideoStreamsOutOfSyncEventData DeserializeMediaLiveEventIncomingVideoStreamsOutOfSyncEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string firstTimestamp = default;
-            string firstDuration = default;
-            string secondTimestamp = default;
-            string secondDuration = default;
-            string timescale = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("firstTimestamp"u8))
-                {
-                    firstTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("firstDuration"u8))
-                {
-                    firstDuration = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("secondTimestamp"u8))
-                {
-                    secondTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("secondDuration"u8))
-                {
-                    secondDuration = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timescale"u8))
-                {
-                    timescale = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventIncomingVideoStreamsOutOfSyncEventData(
-                firstTimestamp,
-                firstDuration,
-                secondTimestamp,
-                secondDuration,
-                timescale,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIncomingVideoStreamsOutOfSyncEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventIncomingVideoStreamsOutOfSyncEventData IPersistableModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventIncomingVideoStreamsOutOfSyncEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIncomingVideoStreamsOutOfSyncEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventIncomingVideoStreamsOutOfSyncEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventIncomingVideoStreamsOutOfSyncEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventIncomingVideoStreamsOutOfSyncEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.cs
deleted file mode 100644
index 00316740b3de..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.cs
+++ /dev/null
@@ -1,81 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Incoming video stream out of sync event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventIncomingVideoStreamsOutOfSync event. </summary>
-    public partial class MediaLiveEventIncomingVideoStreamsOutOfSyncEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIncomingVideoStreamsOutOfSyncEventData"/>. </summary>
-        internal MediaLiveEventIncomingVideoStreamsOutOfSyncEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIncomingVideoStreamsOutOfSyncEventData"/>. </summary>
-        /// <param name="firstTimestamp"> Gets the first timestamp received for one of the quality levels. </param>
-        /// <param name="firstDuration"> Gets the duration of the data chunk with first timestamp. </param>
-        /// <param name="secondTimestamp"> Gets the timestamp received for some other quality levels. </param>
-        /// <param name="secondDuration"> Gets the duration of the data chunk with second timestamp. </param>
-        /// <param name="timescale"> Gets the timescale in which both the timestamps and durations are represented. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventIncomingVideoStreamsOutOfSyncEventData(string firstTimestamp, string firstDuration, string secondTimestamp, string secondDuration, string timescale, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            FirstTimestamp = firstTimestamp;
-            FirstDuration = firstDuration;
-            SecondTimestamp = secondTimestamp;
-            SecondDuration = secondDuration;
-            Timescale = timescale;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the first timestamp received for one of the quality levels. </summary>
-        public string FirstTimestamp { get; }
-        /// <summary> Gets the duration of the data chunk with first timestamp. </summary>
-        public string FirstDuration { get; }
-        /// <summary> Gets the timestamp received for some other quality levels. </summary>
-        public string SecondTimestamp { get; }
-        /// <summary> Gets the duration of the data chunk with second timestamp. </summary>
-        public string SecondDuration { get; }
-        /// <summary> Gets the timescale in which both the timestamps and durations are represented. </summary>
-        public string Timescale { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIngestHeartbeatEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIngestHeartbeatEventData.Serialization.cs
deleted file mode 100644
index 2e196fa43664..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIngestHeartbeatEventData.Serialization.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventIngestHeartbeatEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventIngestHeartbeatEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventIngestHeartbeatEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventIngestHeartbeatEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIngestHeartbeatEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIngestHeartbeatEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TrackType))
-            {
-                writer.WritePropertyName("trackType"u8);
-                writer.WriteStringValue(TrackType);
-            }
-            if (Optional.IsDefined(TrackName))
-            {
-                writer.WritePropertyName("trackName"u8);
-                writer.WriteStringValue(TrackName);
-            }
-            if (Optional.IsDefined(TranscriptionLanguage))
-            {
-                writer.WritePropertyName("transcriptionLanguage"u8);
-                writer.WriteStringValue(TranscriptionLanguage);
-            }
-            if (Optional.IsDefined(TranscriptionState))
-            {
-                writer.WritePropertyName("transcriptionState"u8);
-                writer.WriteStringValue(TranscriptionState);
-            }
-            if (Optional.IsDefined(Bitrate))
-            {
-                writer.WritePropertyName("bitrate"u8);
-                writer.WriteNumberValue(Bitrate.Value);
-            }
-            if (Optional.IsDefined(IncomingBitrate))
-            {
-                writer.WritePropertyName("incomingBitrate"u8);
-                writer.WriteNumberValue(IncomingBitrate.Value);
-            }
-            if (Optional.IsDefined(IngestDriftValue))
-            {
-                writer.WritePropertyName("ingestDriftValue"u8);
-                writer.WriteStringValue(IngestDriftValue);
-            }
-            if (Optional.IsDefined(LastFragmentArrivalTime))
-            {
-                writer.WritePropertyName("lastFragmentArrivalTime"u8);
-                writer.WriteStringValue(LastFragmentArrivalTime);
-            }
-            if (Optional.IsDefined(LastTimestamp))
-            {
-                writer.WritePropertyName("lastTimestamp"u8);
-                writer.WriteStringValue(LastTimestamp);
-            }
-            if (Optional.IsDefined(Timescale))
-            {
-                writer.WritePropertyName("timescale"u8);
-                writer.WriteStringValue(Timescale);
-            }
-            if (Optional.IsDefined(OverlapCount))
-            {
-                writer.WritePropertyName("overlapCount"u8);
-                writer.WriteNumberValue(OverlapCount.Value);
-            }
-            if (Optional.IsDefined(DiscontinuityCount))
-            {
-                writer.WritePropertyName("discontinuityCount"u8);
-                writer.WriteNumberValue(DiscontinuityCount.Value);
-            }
-            if (Optional.IsDefined(NonincreasingCount))
-            {
-                writer.WritePropertyName("nonincreasingCount"u8);
-                writer.WriteNumberValue(NonincreasingCount.Value);
-            }
-            if (Optional.IsDefined(UnexpectedBitrate))
-            {
-                writer.WritePropertyName("unexpectedBitrate"u8);
-                writer.WriteBooleanValue(UnexpectedBitrate.Value);
-            }
-            if (Optional.IsDefined(State))
-            {
-                writer.WritePropertyName("state"u8);
-                writer.WriteStringValue(State);
-            }
-            if (Optional.IsDefined(Healthy))
-            {
-                writer.WritePropertyName("healthy"u8);
-                writer.WriteBooleanValue(Healthy.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventIngestHeartbeatEventData IJsonModel<MediaLiveEventIngestHeartbeatEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIngestHeartbeatEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventIngestHeartbeatEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventIngestHeartbeatEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventIngestHeartbeatEventData DeserializeMediaLiveEventIngestHeartbeatEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string trackType = default;
-            string trackName = default;
-            string transcriptionLanguage = default;
-            string transcriptionState = default;
-            long? bitrate = default;
-            long? incomingBitrate = default;
-            string ingestDriftValue = default;
-            string lastFragmentArrivalTime = default;
-            string lastTimestamp = default;
-            string timescale = default;
-            long? overlapCount = default;
-            long? discontinuityCount = default;
-            long? nonincreasingCount = default;
-            bool? unexpectedBitrate = default;
-            string state = default;
-            bool? healthy = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("trackType"u8))
-                {
-                    trackType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("trackName"u8))
-                {
-                    trackName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("transcriptionLanguage"u8))
-                {
-                    transcriptionLanguage = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("transcriptionState"u8))
-                {
-                    transcriptionState = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("bitrate"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    bitrate = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("incomingBitrate"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    incomingBitrate = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("ingestDriftValue"u8))
-                {
-                    ingestDriftValue = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("lastFragmentArrivalTime"u8))
-                {
-                    lastFragmentArrivalTime = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("lastTimestamp"u8))
-                {
-                    lastTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timescale"u8))
-                {
-                    timescale = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("overlapCount"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    overlapCount = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("discontinuityCount"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    discontinuityCount = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("nonincreasingCount"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nonincreasingCount = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("unexpectedBitrate"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    unexpectedBitrate = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("healthy"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    healthy = property.Value.GetBoolean();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventIngestHeartbeatEventData(
-                trackType,
-                trackName,
-                transcriptionLanguage,
-                transcriptionState,
-                bitrate,
-                incomingBitrate,
-                ingestDriftValue,
-                lastFragmentArrivalTime,
-                lastTimestamp,
-                timescale,
-                overlapCount,
-                discontinuityCount,
-                nonincreasingCount,
-                unexpectedBitrate,
-                state,
-                healthy,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventIngestHeartbeatEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIngestHeartbeatEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIngestHeartbeatEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventIngestHeartbeatEventData IPersistableModel<MediaLiveEventIngestHeartbeatEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventIngestHeartbeatEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventIngestHeartbeatEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventIngestHeartbeatEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventIngestHeartbeatEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventIngestHeartbeatEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventIngestHeartbeatEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIngestHeartbeatEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIngestHeartbeatEventData.cs
deleted file mode 100644
index 0171662bcace..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventIngestHeartbeatEventData.cs
+++ /dev/null
@@ -1,125 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Ingest heartbeat event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventIngestHeartbeat event. </summary>
-    public partial class MediaLiveEventIngestHeartbeatEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIngestHeartbeatEventData"/>. </summary>
-        internal MediaLiveEventIngestHeartbeatEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventIngestHeartbeatEventData"/>. </summary>
-        /// <param name="trackType"> Gets the type of the track (Audio / Video). </param>
-        /// <param name="trackName"> Gets the track name. </param>
-        /// <param name="transcriptionLanguage"> Gets the Live Transcription language. </param>
-        /// <param name="transcriptionState"> Gets the Live Transcription state. </param>
-        /// <param name="bitrate"> Gets the bitrate of the track. </param>
-        /// <param name="incomingBitrate"> Gets the incoming bitrate. </param>
-        /// <param name="ingestDriftValue"> Gets the track ingest drift value. </param>
-        /// <param name="lastFragmentArrivalTime"> Gets the arrival UTC time of the last fragment. </param>
-        /// <param name="lastTimestamp"> Gets the last timestamp. </param>
-        /// <param name="timescale"> Gets the timescale of the last timestamp. </param>
-        /// <param name="overlapCount"> Gets the fragment Overlap count. </param>
-        /// <param name="discontinuityCount"> Gets the fragment Discontinuity count. </param>
-        /// <param name="nonincreasingCount"> Gets Non increasing count. </param>
-        /// <param name="unexpectedBitrate"> Gets a value indicating whether unexpected bitrate is present or not. </param>
-        /// <param name="state"> Gets the state of the live event. </param>
-        /// <param name="healthy"> Gets a value indicating whether preview is healthy or not. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventIngestHeartbeatEventData(string trackType, string trackName, string transcriptionLanguage, string transcriptionState, long? bitrate, long? incomingBitrate, string ingestDriftValue, string lastFragmentArrivalTime, string lastTimestamp, string timescale, long? overlapCount, long? discontinuityCount, long? nonincreasingCount, bool? unexpectedBitrate, string state, bool? healthy, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TrackType = trackType;
-            TrackName = trackName;
-            TranscriptionLanguage = transcriptionLanguage;
-            TranscriptionState = transcriptionState;
-            Bitrate = bitrate;
-            IncomingBitrate = incomingBitrate;
-            IngestDriftValue = ingestDriftValue;
-            LastFragmentArrivalTime = lastFragmentArrivalTime;
-            LastTimestamp = lastTimestamp;
-            Timescale = timescale;
-            OverlapCount = overlapCount;
-            DiscontinuityCount = discontinuityCount;
-            NonincreasingCount = nonincreasingCount;
-            UnexpectedBitrate = unexpectedBitrate;
-            State = state;
-            Healthy = healthy;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the type of the track (Audio / Video). </summary>
-        public string TrackType { get; }
-        /// <summary> Gets the track name. </summary>
-        public string TrackName { get; }
-        /// <summary> Gets the Live Transcription language. </summary>
-        public string TranscriptionLanguage { get; }
-        /// <summary> Gets the Live Transcription state. </summary>
-        public string TranscriptionState { get; }
-        /// <summary> Gets the bitrate of the track. </summary>
-        public long? Bitrate { get; }
-        /// <summary> Gets the incoming bitrate. </summary>
-        public long? IncomingBitrate { get; }
-        /// <summary> Gets the track ingest drift value. </summary>
-        public string IngestDriftValue { get; }
-        /// <summary> Gets the arrival UTC time of the last fragment. </summary>
-        public string LastFragmentArrivalTime { get; }
-        /// <summary> Gets the last timestamp. </summary>
-        public string LastTimestamp { get; }
-        /// <summary> Gets the timescale of the last timestamp. </summary>
-        public string Timescale { get; }
-        /// <summary> Gets the fragment Overlap count. </summary>
-        public long? OverlapCount { get; }
-        /// <summary> Gets the fragment Discontinuity count. </summary>
-        public long? DiscontinuityCount { get; }
-        /// <summary> Gets Non increasing count. </summary>
-        public long? NonincreasingCount { get; }
-        /// <summary> Gets a value indicating whether unexpected bitrate is present or not. </summary>
-        public bool? UnexpectedBitrate { get; }
-        /// <summary> Gets the state of the live event. </summary>
-        public string State { get; }
-        /// <summary> Gets a value indicating whether preview is healthy or not. </summary>
-        public bool? Healthy { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventTrackDiscontinuityDetectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventTrackDiscontinuityDetectedEventData.Serialization.cs
deleted file mode 100644
index 58ca54e43916..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventTrackDiscontinuityDetectedEventData.Serialization.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MediaLiveEventTrackDiscontinuityDetectedEventData : IUtf8JsonSerializable, IJsonModel<MediaLiveEventTrackDiscontinuityDetectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaLiveEventTrackDiscontinuityDetectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaLiveEventTrackDiscontinuityDetectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventTrackDiscontinuityDetectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventTrackDiscontinuityDetectedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TrackType))
-            {
-                writer.WritePropertyName("trackType"u8);
-                writer.WriteStringValue(TrackType);
-            }
-            if (Optional.IsDefined(TrackName))
-            {
-                writer.WritePropertyName("trackName"u8);
-                writer.WriteStringValue(TrackName);
-            }
-            if (Optional.IsDefined(Bitrate))
-            {
-                writer.WritePropertyName("bitrate"u8);
-                writer.WriteNumberValue(Bitrate.Value);
-            }
-            if (Optional.IsDefined(PreviousTimestamp))
-            {
-                writer.WritePropertyName("previousTimestamp"u8);
-                writer.WriteStringValue(PreviousTimestamp);
-            }
-            if (Optional.IsDefined(NewTimestamp))
-            {
-                writer.WritePropertyName("newTimestamp"u8);
-                writer.WriteStringValue(NewTimestamp);
-            }
-            if (Optional.IsDefined(Timescale))
-            {
-                writer.WritePropertyName("timescale"u8);
-                writer.WriteStringValue(Timescale);
-            }
-            if (Optional.IsDefined(DiscontinuityGap))
-            {
-                writer.WritePropertyName("discontinuityGap"u8);
-                writer.WriteStringValue(DiscontinuityGap);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MediaLiveEventTrackDiscontinuityDetectedEventData IJsonModel<MediaLiveEventTrackDiscontinuityDetectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventTrackDiscontinuityDetectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaLiveEventTrackDiscontinuityDetectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaLiveEventTrackDiscontinuityDetectedEventData(document.RootElement, options);
-        }
-
-        internal static MediaLiveEventTrackDiscontinuityDetectedEventData DeserializeMediaLiveEventTrackDiscontinuityDetectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string trackType = default;
-            string trackName = default;
-            long? bitrate = default;
-            string previousTimestamp = default;
-            string newTimestamp = default;
-            string timescale = default;
-            string discontinuityGap = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("trackType"u8))
-                {
-                    trackType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("trackName"u8))
-                {
-                    trackName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("bitrate"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    bitrate = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("previousTimestamp"u8))
-                {
-                    previousTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("newTimestamp"u8))
-                {
-                    newTimestamp = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("timescale"u8))
-                {
-                    timescale = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("discontinuityGap"u8))
-                {
-                    discontinuityGap = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MediaLiveEventTrackDiscontinuityDetectedEventData(
-                trackType,
-                trackName,
-                bitrate,
-                previousTimestamp,
-                newTimestamp,
-                timescale,
-                discontinuityGap,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaLiveEventTrackDiscontinuityDetectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventTrackDiscontinuityDetectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventTrackDiscontinuityDetectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaLiveEventTrackDiscontinuityDetectedEventData IPersistableModel<MediaLiveEventTrackDiscontinuityDetectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaLiveEventTrackDiscontinuityDetectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaLiveEventTrackDiscontinuityDetectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaLiveEventTrackDiscontinuityDetectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaLiveEventTrackDiscontinuityDetectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MediaLiveEventTrackDiscontinuityDetectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMediaLiveEventTrackDiscontinuityDetectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventTrackDiscontinuityDetectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventTrackDiscontinuityDetectedEventData.cs
deleted file mode 100644
index e077f783f04a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MediaLiveEventTrackDiscontinuityDetectedEventData.cs
+++ /dev/null
@@ -1,89 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Ingest track discontinuity detected event data. Schema of the data property of an EventGridEvent for a Microsoft.Media.LiveEventTrackDiscontinuityDetected event. </summary>
-    public partial class MediaLiveEventTrackDiscontinuityDetectedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventTrackDiscontinuityDetectedEventData"/>. </summary>
-        internal MediaLiveEventTrackDiscontinuityDetectedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MediaLiveEventTrackDiscontinuityDetectedEventData"/>. </summary>
-        /// <param name="trackType"> Gets the type of the track (Audio / Video). </param>
-        /// <param name="trackName"> Gets the track name. </param>
-        /// <param name="bitrate"> Gets the bitrate. </param>
-        /// <param name="previousTimestamp"> Gets the timestamp of the previous fragment. </param>
-        /// <param name="newTimestamp"> Gets the timestamp of the current fragment. </param>
-        /// <param name="timescale"> Gets the timescale in which both timestamps and discontinuity gap are represented. </param>
-        /// <param name="discontinuityGap"> Gets the discontinuity gap between PreviousTimestamp and NewTimestamp. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MediaLiveEventTrackDiscontinuityDetectedEventData(string trackType, string trackName, long? bitrate, string previousTimestamp, string newTimestamp, string timescale, string discontinuityGap, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TrackType = trackType;
-            TrackName = trackName;
-            Bitrate = bitrate;
-            PreviousTimestamp = previousTimestamp;
-            NewTimestamp = newTimestamp;
-            Timescale = timescale;
-            DiscontinuityGap = discontinuityGap;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Gets the type of the track (Audio / Video). </summary>
-        public string TrackType { get; }
-        /// <summary> Gets the track name. </summary>
-        public string TrackName { get; }
-        /// <summary> Gets the bitrate. </summary>
-        public long? Bitrate { get; }
-        /// <summary> Gets the timestamp of the previous fragment. </summary>
-        public string PreviousTimestamp { get; }
-        /// <summary> Gets the timestamp of the current fragment. </summary>
-        public string NewTimestamp { get; }
-        /// <summary> Gets the timescale in which both timestamps and discontinuity gap are represented. </summary>
-        public string Timescale { get; }
-        /// <summary> Gets the discontinuity gap between PreviousTimestamp and NewTimestamp. </summary>
-        public string DiscontinuityGap { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsAppIdentifierModel.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsAppIdentifierModel.Serialization.cs
deleted file mode 100644
index 3c142425d7d9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsAppIdentifierModel.Serialization.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MicrosoftTeamsAppIdentifierModel : IUtf8JsonSerializable, IJsonModel<MicrosoftTeamsAppIdentifierModel>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MicrosoftTeamsAppIdentifierModel>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MicrosoftTeamsAppIdentifierModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MicrosoftTeamsAppIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MicrosoftTeamsAppIdentifierModel)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appId"u8);
-            writer.WriteStringValue(AppId);
-            writer.WritePropertyName("cloud"u8);
-            writer.WriteStringValue(Cloud.ToString());
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MicrosoftTeamsAppIdentifierModel IJsonModel<MicrosoftTeamsAppIdentifierModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MicrosoftTeamsAppIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MicrosoftTeamsAppIdentifierModel)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMicrosoftTeamsAppIdentifierModel(document.RootElement, options);
-        }
-
-        internal static MicrosoftTeamsAppIdentifierModel DeserializeMicrosoftTeamsAppIdentifierModel(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string appId = default;
-            CommunicationCloudEnvironmentModel cloud = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appId"u8))
-                {
-                    appId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("cloud"u8))
-                {
-                    cloud = new CommunicationCloudEnvironmentModel(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MicrosoftTeamsAppIdentifierModel(appId, cloud, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MicrosoftTeamsAppIdentifierModel>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MicrosoftTeamsAppIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MicrosoftTeamsAppIdentifierModel)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MicrosoftTeamsAppIdentifierModel IPersistableModel<MicrosoftTeamsAppIdentifierModel>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MicrosoftTeamsAppIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMicrosoftTeamsAppIdentifierModel(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MicrosoftTeamsAppIdentifierModel)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MicrosoftTeamsAppIdentifierModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MicrosoftTeamsAppIdentifierModel FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMicrosoftTeamsAppIdentifierModel(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsAppIdentifierModel.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsAppIdentifierModel.cs
deleted file mode 100644
index 41e1a566a23f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsAppIdentifierModel.cs
+++ /dev/null
@@ -1,81 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> A Microsoft Teams application. </summary>
-    public partial class MicrosoftTeamsAppIdentifierModel
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MicrosoftTeamsAppIdentifierModel"/>. </summary>
-        /// <param name="appId"> The Id of the Microsoft Teams application. </param>
-        /// <param name="cloud"> The cloud that the Microsoft Teams application belongs to. By default 'public' if missing. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appId"/> is null. </exception>
-        internal MicrosoftTeamsAppIdentifierModel(string appId, CommunicationCloudEnvironmentModel cloud)
-        {
-            Argument.AssertNotNull(appId, nameof(appId));
-
-            AppId = appId;
-            Cloud = cloud;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MicrosoftTeamsAppIdentifierModel"/>. </summary>
-        /// <param name="appId"> The Id of the Microsoft Teams application. </param>
-        /// <param name="cloud"> The cloud that the Microsoft Teams application belongs to. By default 'public' if missing. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MicrosoftTeamsAppIdentifierModel(string appId, CommunicationCloudEnvironmentModel cloud, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppId = appId;
-            Cloud = cloud;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MicrosoftTeamsAppIdentifierModel"/> for deserialization. </summary>
-        internal MicrosoftTeamsAppIdentifierModel()
-        {
-        }
-
-        /// <summary> The Id of the Microsoft Teams application. </summary>
-        public string AppId { get; }
-        /// <summary> The cloud that the Microsoft Teams application belongs to. By default 'public' if missing. </summary>
-        public CommunicationCloudEnvironmentModel Cloud { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsUserIdentifierModel.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsUserIdentifierModel.Serialization.cs
deleted file mode 100644
index 954ae03dd03a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsUserIdentifierModel.Serialization.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class MicrosoftTeamsUserIdentifierModel : IUtf8JsonSerializable, IJsonModel<MicrosoftTeamsUserIdentifierModel>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MicrosoftTeamsUserIdentifierModel>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MicrosoftTeamsUserIdentifierModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MicrosoftTeamsUserIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MicrosoftTeamsUserIdentifierModel)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("userId"u8);
-            writer.WriteStringValue(UserId);
-            if (Optional.IsDefined(IsAnonymous))
-            {
-                writer.WritePropertyName("isAnonymous"u8);
-                writer.WriteBooleanValue(IsAnonymous.Value);
-            }
-            writer.WritePropertyName("cloud"u8);
-            writer.WriteStringValue(Cloud.ToString());
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        MicrosoftTeamsUserIdentifierModel IJsonModel<MicrosoftTeamsUserIdentifierModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MicrosoftTeamsUserIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MicrosoftTeamsUserIdentifierModel)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMicrosoftTeamsUserIdentifierModel(document.RootElement, options);
-        }
-
-        internal static MicrosoftTeamsUserIdentifierModel DeserializeMicrosoftTeamsUserIdentifierModel(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string userId = default;
-            bool? isAnonymous = default;
-            CommunicationCloudEnvironmentModel cloud = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("userId"u8))
-                {
-                    userId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("isAnonymous"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    isAnonymous = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("cloud"u8))
-                {
-                    cloud = new CommunicationCloudEnvironmentModel(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MicrosoftTeamsUserIdentifierModel(userId, isAnonymous, cloud, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MicrosoftTeamsUserIdentifierModel>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MicrosoftTeamsUserIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MicrosoftTeamsUserIdentifierModel)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MicrosoftTeamsUserIdentifierModel IPersistableModel<MicrosoftTeamsUserIdentifierModel>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MicrosoftTeamsUserIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMicrosoftTeamsUserIdentifierModel(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MicrosoftTeamsUserIdentifierModel)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MicrosoftTeamsUserIdentifierModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MicrosoftTeamsUserIdentifierModel FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMicrosoftTeamsUserIdentifierModel(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsUserIdentifierModel.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsUserIdentifierModel.cs
deleted file mode 100644
index d8958e4d8035..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/MicrosoftTeamsUserIdentifierModel.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> A Microsoft Teams user. </summary>
-    public partial class MicrosoftTeamsUserIdentifierModel
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="MicrosoftTeamsUserIdentifierModel"/>. </summary>
-        /// <param name="userId"> The Id of the Microsoft Teams user. If not anonymous, this is the AAD object Id of the user. </param>
-        /// <param name="cloud"> The cloud that the Microsoft Teams user belongs to. By default 'public' if missing. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="userId"/> is null. </exception>
-        internal MicrosoftTeamsUserIdentifierModel(string userId, CommunicationCloudEnvironmentModel cloud)
-        {
-            Argument.AssertNotNull(userId, nameof(userId));
-
-            UserId = userId;
-            Cloud = cloud;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MicrosoftTeamsUserIdentifierModel"/>. </summary>
-        /// <param name="userId"> The Id of the Microsoft Teams user. If not anonymous, this is the AAD object Id of the user. </param>
-        /// <param name="isAnonymous"> True if the Microsoft Teams user is anonymous. By default false if missing. </param>
-        /// <param name="cloud"> The cloud that the Microsoft Teams user belongs to. By default 'public' if missing. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MicrosoftTeamsUserIdentifierModel(string userId, bool? isAnonymous, CommunicationCloudEnvironmentModel cloud, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            UserId = userId;
-            IsAnonymous = isAnonymous;
-            Cloud = cloud;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="MicrosoftTeamsUserIdentifierModel"/> for deserialization. </summary>
-        internal MicrosoftTeamsUserIdentifierModel()
-        {
-        }
-
-        /// <summary> The Id of the Microsoft Teams user. If not anonymous, this is the AAD object Id of the user. </summary>
-        public string UserId { get; }
-        /// <summary> True if the Microsoft Teams user is anonymous. By default false if missing. </summary>
-        public bool? IsAnonymous { get; }
-        /// <summary> The cloud that the Microsoft Teams user belongs to. By default 'public' if missing. </summary>
-        public CommunicationCloudEnvironmentModel Cloud { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PhoneNumberIdentifierModel.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PhoneNumberIdentifierModel.Serialization.cs
deleted file mode 100644
index 9e5867b71f14..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PhoneNumberIdentifierModel.Serialization.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class PhoneNumberIdentifierModel : IUtf8JsonSerializable, IJsonModel<PhoneNumberIdentifierModel>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<PhoneNumberIdentifierModel>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<PhoneNumberIdentifierModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PhoneNumberIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PhoneNumberIdentifierModel)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("value"u8);
-            writer.WriteStringValue(Value);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        PhoneNumberIdentifierModel IJsonModel<PhoneNumberIdentifierModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PhoneNumberIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PhoneNumberIdentifierModel)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializePhoneNumberIdentifierModel(document.RootElement, options);
-        }
-
-        internal static PhoneNumberIdentifierModel DeserializePhoneNumberIdentifierModel(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string value = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("value"u8))
-                {
-                    value = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new PhoneNumberIdentifierModel(value, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<PhoneNumberIdentifierModel>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PhoneNumberIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(PhoneNumberIdentifierModel)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        PhoneNumberIdentifierModel IPersistableModel<PhoneNumberIdentifierModel>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PhoneNumberIdentifierModel>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializePhoneNumberIdentifierModel(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(PhoneNumberIdentifierModel)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<PhoneNumberIdentifierModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static PhoneNumberIdentifierModel FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializePhoneNumberIdentifierModel(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PhoneNumberIdentifierModel.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PhoneNumberIdentifierModel.cs
deleted file mode 100644
index fab888938068..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PhoneNumberIdentifierModel.cs
+++ /dev/null
@@ -1,75 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> A phone number. </summary>
-    public partial class PhoneNumberIdentifierModel
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="PhoneNumberIdentifierModel"/>. </summary>
-        /// <param name="value"> The phone number in E.164 format. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        internal PhoneNumberIdentifierModel(string value)
-        {
-            Argument.AssertNotNull(value, nameof(value));
-
-            Value = value;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="PhoneNumberIdentifierModel"/>. </summary>
-        /// <param name="value"> The phone number in E.164 format. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal PhoneNumberIdentifierModel(string value, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Value = value;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="PhoneNumberIdentifierModel"/> for deserialization. </summary>
-        internal PhoneNumberIdentifierModel()
-        {
-        }
-
-        /// <summary> The phone number in E.164 format. </summary>
-        public string Value { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateChangedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateChangedEventData.Serialization.cs
deleted file mode 100644
index d0a89e1b3172..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateChangedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class PolicyInsightsPolicyStateChangedEventData : IUtf8JsonSerializable, IJsonModel<PolicyInsightsPolicyStateChangedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<PolicyInsightsPolicyStateChangedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<PolicyInsightsPolicyStateChangedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateChangedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(PolicyAssignmentId))
-            {
-                writer.WritePropertyName("policyAssignmentId"u8);
-                writer.WriteStringValue(PolicyAssignmentId);
-            }
-            if (Optional.IsDefined(PolicyDefinitionId))
-            {
-                writer.WritePropertyName("policyDefinitionId"u8);
-                writer.WriteStringValue(PolicyDefinitionId);
-            }
-            if (Optional.IsDefined(PolicyDefinitionReferenceId))
-            {
-                writer.WritePropertyName("policyDefinitionReferenceId"u8);
-                writer.WriteStringValue(PolicyDefinitionReferenceId);
-            }
-            if (Optional.IsDefined(ComplianceState))
-            {
-                writer.WritePropertyName("complianceState"u8);
-                writer.WriteStringValue(ComplianceState);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ComplianceReasonCode))
-            {
-                writer.WritePropertyName("complianceReasonCode"u8);
-                writer.WriteStringValue(ComplianceReasonCode);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        PolicyInsightsPolicyStateChangedEventData IJsonModel<PolicyInsightsPolicyStateChangedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateChangedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializePolicyInsightsPolicyStateChangedEventData(document.RootElement, options);
-        }
-
-        internal static PolicyInsightsPolicyStateChangedEventData DeserializePolicyInsightsPolicyStateChangedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string policyAssignmentId = default;
-            string policyDefinitionId = default;
-            string policyDefinitionReferenceId = default;
-            string complianceState = default;
-            string subscriptionId = default;
-            string complianceReasonCode = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("policyAssignmentId"u8))
-                {
-                    policyAssignmentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyDefinitionId"u8))
-                {
-                    policyDefinitionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyDefinitionReferenceId"u8))
-                {
-                    policyDefinitionReferenceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("complianceState"u8))
-                {
-                    complianceState = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("complianceReasonCode"u8))
-                {
-                    complianceReasonCode = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new PolicyInsightsPolicyStateChangedEventData(
-                timestamp,
-                policyAssignmentId,
-                policyDefinitionId,
-                policyDefinitionReferenceId,
-                complianceState,
-                subscriptionId,
-                complianceReasonCode,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<PolicyInsightsPolicyStateChangedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateChangedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        PolicyInsightsPolicyStateChangedEventData IPersistableModel<PolicyInsightsPolicyStateChangedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializePolicyInsightsPolicyStateChangedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateChangedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<PolicyInsightsPolicyStateChangedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static PolicyInsightsPolicyStateChangedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializePolicyInsightsPolicyStateChangedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateChangedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateChangedEventData.cs
deleted file mode 100644
index 3c38df1b64d7..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateChangedEventData.cs
+++ /dev/null
@@ -1,96 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.PolicyInsights.PolicyStateChanged event. </summary>
-    public partial class PolicyInsightsPolicyStateChangedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateChangedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        internal PolicyInsightsPolicyStateChangedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateChangedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        /// <param name="policyAssignmentId"> The resource ID of the policy assignment. </param>
-        /// <param name="policyDefinitionId"> The resource ID of the policy definition. </param>
-        /// <param name="policyDefinitionReferenceId"> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </param>
-        /// <param name="complianceState"> The compliance state of the resource with respect to the policy assignment. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="complianceReasonCode"> The compliance reason code. May be empty. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal PolicyInsightsPolicyStateChangedEventData(DateTimeOffset timestamp, string policyAssignmentId, string policyDefinitionId, string policyDefinitionReferenceId, string complianceState, string subscriptionId, string complianceReasonCode, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            PolicyAssignmentId = policyAssignmentId;
-            PolicyDefinitionId = policyDefinitionId;
-            PolicyDefinitionReferenceId = policyDefinitionReferenceId;
-            ComplianceState = complianceState;
-            SubscriptionId = subscriptionId;
-            ComplianceReasonCode = complianceReasonCode;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateChangedEventData"/> for deserialization. </summary>
-        internal PolicyInsightsPolicyStateChangedEventData()
-        {
-        }
-
-        /// <summary> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The resource ID of the policy assignment. </summary>
-        public string PolicyAssignmentId { get; }
-        /// <summary> The resource ID of the policy definition. </summary>
-        public string PolicyDefinitionId { get; }
-        /// <summary> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </summary>
-        public string PolicyDefinitionReferenceId { get; }
-        /// <summary> The compliance state of the resource with respect to the policy assignment. </summary>
-        public string ComplianceState { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The compliance reason code. May be empty. </summary>
-        public string ComplianceReasonCode { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateCreatedEventData.Serialization.cs
deleted file mode 100644
index 7300f5a3a9cc..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class PolicyInsightsPolicyStateCreatedEventData : IUtf8JsonSerializable, IJsonModel<PolicyInsightsPolicyStateCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<PolicyInsightsPolicyStateCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<PolicyInsightsPolicyStateCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(PolicyAssignmentId))
-            {
-                writer.WritePropertyName("policyAssignmentId"u8);
-                writer.WriteStringValue(PolicyAssignmentId);
-            }
-            if (Optional.IsDefined(PolicyDefinitionId))
-            {
-                writer.WritePropertyName("policyDefinitionId"u8);
-                writer.WriteStringValue(PolicyDefinitionId);
-            }
-            if (Optional.IsDefined(PolicyDefinitionReferenceId))
-            {
-                writer.WritePropertyName("policyDefinitionReferenceId"u8);
-                writer.WriteStringValue(PolicyDefinitionReferenceId);
-            }
-            if (Optional.IsDefined(ComplianceState))
-            {
-                writer.WritePropertyName("complianceState"u8);
-                writer.WriteStringValue(ComplianceState);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ComplianceReasonCode))
-            {
-                writer.WritePropertyName("complianceReasonCode"u8);
-                writer.WriteStringValue(ComplianceReasonCode);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        PolicyInsightsPolicyStateCreatedEventData IJsonModel<PolicyInsightsPolicyStateCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializePolicyInsightsPolicyStateCreatedEventData(document.RootElement, options);
-        }
-
-        internal static PolicyInsightsPolicyStateCreatedEventData DeserializePolicyInsightsPolicyStateCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string policyAssignmentId = default;
-            string policyDefinitionId = default;
-            string policyDefinitionReferenceId = default;
-            string complianceState = default;
-            string subscriptionId = default;
-            string complianceReasonCode = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("policyAssignmentId"u8))
-                {
-                    policyAssignmentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyDefinitionId"u8))
-                {
-                    policyDefinitionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyDefinitionReferenceId"u8))
-                {
-                    policyDefinitionReferenceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("complianceState"u8))
-                {
-                    complianceState = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("complianceReasonCode"u8))
-                {
-                    complianceReasonCode = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new PolicyInsightsPolicyStateCreatedEventData(
-                timestamp,
-                policyAssignmentId,
-                policyDefinitionId,
-                policyDefinitionReferenceId,
-                complianceState,
-                subscriptionId,
-                complianceReasonCode,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<PolicyInsightsPolicyStateCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        PolicyInsightsPolicyStateCreatedEventData IPersistableModel<PolicyInsightsPolicyStateCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializePolicyInsightsPolicyStateCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<PolicyInsightsPolicyStateCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static PolicyInsightsPolicyStateCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializePolicyInsightsPolicyStateCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateCreatedEventData.cs
deleted file mode 100644
index deb18f455881..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateCreatedEventData.cs
+++ /dev/null
@@ -1,96 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.PolicyInsights.PolicyStateCreated event. </summary>
-    public partial class PolicyInsightsPolicyStateCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateCreatedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        internal PolicyInsightsPolicyStateCreatedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateCreatedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        /// <param name="policyAssignmentId"> The resource ID of the policy assignment. </param>
-        /// <param name="policyDefinitionId"> The resource ID of the policy definition. </param>
-        /// <param name="policyDefinitionReferenceId"> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </param>
-        /// <param name="complianceState"> The compliance state of the resource with respect to the policy assignment. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="complianceReasonCode"> The compliance reason code. May be empty. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal PolicyInsightsPolicyStateCreatedEventData(DateTimeOffset timestamp, string policyAssignmentId, string policyDefinitionId, string policyDefinitionReferenceId, string complianceState, string subscriptionId, string complianceReasonCode, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            PolicyAssignmentId = policyAssignmentId;
-            PolicyDefinitionId = policyDefinitionId;
-            PolicyDefinitionReferenceId = policyDefinitionReferenceId;
-            ComplianceState = complianceState;
-            SubscriptionId = subscriptionId;
-            ComplianceReasonCode = complianceReasonCode;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateCreatedEventData"/> for deserialization. </summary>
-        internal PolicyInsightsPolicyStateCreatedEventData()
-        {
-        }
-
-        /// <summary> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The resource ID of the policy assignment. </summary>
-        public string PolicyAssignmentId { get; }
-        /// <summary> The resource ID of the policy definition. </summary>
-        public string PolicyDefinitionId { get; }
-        /// <summary> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </summary>
-        public string PolicyDefinitionReferenceId { get; }
-        /// <summary> The compliance state of the resource with respect to the policy assignment. </summary>
-        public string ComplianceState { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The compliance reason code. May be empty. </summary>
-        public string ComplianceReasonCode { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateDeletedEventData.Serialization.cs
deleted file mode 100644
index f7b41e8af79d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class PolicyInsightsPolicyStateDeletedEventData : IUtf8JsonSerializable, IJsonModel<PolicyInsightsPolicyStateDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<PolicyInsightsPolicyStateDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<PolicyInsightsPolicyStateDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(PolicyAssignmentId))
-            {
-                writer.WritePropertyName("policyAssignmentId"u8);
-                writer.WriteStringValue(PolicyAssignmentId);
-            }
-            if (Optional.IsDefined(PolicyDefinitionId))
-            {
-                writer.WritePropertyName("policyDefinitionId"u8);
-                writer.WriteStringValue(PolicyDefinitionId);
-            }
-            if (Optional.IsDefined(PolicyDefinitionReferenceId))
-            {
-                writer.WritePropertyName("policyDefinitionReferenceId"u8);
-                writer.WriteStringValue(PolicyDefinitionReferenceId);
-            }
-            if (Optional.IsDefined(ComplianceState))
-            {
-                writer.WritePropertyName("complianceState"u8);
-                writer.WriteStringValue(ComplianceState);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ComplianceReasonCode))
-            {
-                writer.WritePropertyName("complianceReasonCode"u8);
-                writer.WriteStringValue(ComplianceReasonCode);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        PolicyInsightsPolicyStateDeletedEventData IJsonModel<PolicyInsightsPolicyStateDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializePolicyInsightsPolicyStateDeletedEventData(document.RootElement, options);
-        }
-
-        internal static PolicyInsightsPolicyStateDeletedEventData DeserializePolicyInsightsPolicyStateDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string policyAssignmentId = default;
-            string policyDefinitionId = default;
-            string policyDefinitionReferenceId = default;
-            string complianceState = default;
-            string subscriptionId = default;
-            string complianceReasonCode = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("policyAssignmentId"u8))
-                {
-                    policyAssignmentId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyDefinitionId"u8))
-                {
-                    policyDefinitionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyDefinitionReferenceId"u8))
-                {
-                    policyDefinitionReferenceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("complianceState"u8))
-                {
-                    complianceState = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("complianceReasonCode"u8))
-                {
-                    complianceReasonCode = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new PolicyInsightsPolicyStateDeletedEventData(
-                timestamp,
-                policyAssignmentId,
-                policyDefinitionId,
-                policyDefinitionReferenceId,
-                complianceState,
-                subscriptionId,
-                complianceReasonCode,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<PolicyInsightsPolicyStateDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        PolicyInsightsPolicyStateDeletedEventData IPersistableModel<PolicyInsightsPolicyStateDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PolicyInsightsPolicyStateDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializePolicyInsightsPolicyStateDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(PolicyInsightsPolicyStateDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<PolicyInsightsPolicyStateDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static PolicyInsightsPolicyStateDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializePolicyInsightsPolicyStateDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateDeletedEventData.cs
deleted file mode 100644
index 412c1ba32b64..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/PolicyInsightsPolicyStateDeletedEventData.cs
+++ /dev/null
@@ -1,96 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.PolicyInsights.PolicyStateDeleted event. </summary>
-    public partial class PolicyInsightsPolicyStateDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateDeletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        internal PolicyInsightsPolicyStateDeletedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateDeletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </param>
-        /// <param name="policyAssignmentId"> The resource ID of the policy assignment. </param>
-        /// <param name="policyDefinitionId"> The resource ID of the policy definition. </param>
-        /// <param name="policyDefinitionReferenceId"> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </param>
-        /// <param name="complianceState"> The compliance state of the resource with respect to the policy assignment. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="complianceReasonCode"> The compliance reason code. May be empty. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal PolicyInsightsPolicyStateDeletedEventData(DateTimeOffset timestamp, string policyAssignmentId, string policyDefinitionId, string policyDefinitionReferenceId, string complianceState, string subscriptionId, string complianceReasonCode, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            PolicyAssignmentId = policyAssignmentId;
-            PolicyDefinitionId = policyDefinitionId;
-            PolicyDefinitionReferenceId = policyDefinitionReferenceId;
-            ComplianceState = complianceState;
-            SubscriptionId = subscriptionId;
-            ComplianceReasonCode = complianceReasonCode;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="PolicyInsightsPolicyStateDeletedEventData"/> for deserialization. </summary>
-        internal PolicyInsightsPolicyStateDeletedEventData()
-        {
-        }
-
-        /// <summary> The time that the resource was scanned by Azure Policy in the Universal ISO 8601 DateTime format yyyy-MM-ddTHH:mm:ss.fffffffZ. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The resource ID of the policy assignment. </summary>
-        public string PolicyAssignmentId { get; }
-        /// <summary> The resource ID of the policy definition. </summary>
-        public string PolicyDefinitionId { get; }
-        /// <summary> The reference ID for the policy definition inside the initiative definition, if the policy assignment is for an initiative. May be empty. </summary>
-        public string PolicyDefinitionReferenceId { get; }
-        /// <summary> The compliance state of the resource with respect to the policy assignment. </summary>
-        public string ComplianceState { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The compliance reason code. May be empty. </summary>
-        public string ComplianceReasonCode { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingChannelType.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingChannelType.cs
deleted file mode 100644
index 68b23c7873a2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingChannelType.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Recording channel type. </summary>
-    public readonly partial struct RecordingChannelType : IEquatable<RecordingChannelType>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="RecordingChannelType"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public RecordingChannelType(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string MixedValue = "Mixed";
-        private const string UnmixedValue = "Unmixed";
-
-        /// <summary> Mixed channel type. </summary>
-        public static RecordingChannelType Mixed { get; } = new RecordingChannelType(MixedValue);
-        /// <summary> Unmixed channel type. </summary>
-        public static RecordingChannelType Unmixed { get; } = new RecordingChannelType(UnmixedValue);
-        /// <summary> Determines if two <see cref="RecordingChannelType"/> values are the same. </summary>
-        public static bool operator ==(RecordingChannelType left, RecordingChannelType right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="RecordingChannelType"/> values are not the same. </summary>
-        public static bool operator !=(RecordingChannelType left, RecordingChannelType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="RecordingChannelType"/>. </summary>
-        public static implicit operator RecordingChannelType(string value) => new RecordingChannelType(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is RecordingChannelType other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(RecordingChannelType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingContentType.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingContentType.cs
deleted file mode 100644
index 2c4d289397cc..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingContentType.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Recording content type. </summary>
-    public readonly partial struct RecordingContentType : IEquatable<RecordingContentType>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="RecordingContentType"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public RecordingContentType(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string AudioVideoValue = "AudioVideo";
-        private const string AudioValue = "Audio";
-
-        /// <summary> AudioVideo content type. </summary>
-        public static RecordingContentType AudioVideo { get; } = new RecordingContentType(AudioVideoValue);
-        /// <summary> Audio content type. </summary>
-        public static RecordingContentType Audio { get; } = new RecordingContentType(AudioValue);
-        /// <summary> Determines if two <see cref="RecordingContentType"/> values are the same. </summary>
-        public static bool operator ==(RecordingContentType left, RecordingContentType right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="RecordingContentType"/> values are not the same. </summary>
-        public static bool operator !=(RecordingContentType left, RecordingContentType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="RecordingContentType"/>. </summary>
-        public static implicit operator RecordingContentType(string value) => new RecordingContentType(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is RecordingContentType other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(RecordingContentType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingFormatType.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingFormatType.cs
deleted file mode 100644
index 7e10a5a8f3e0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RecordingFormatType.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Recording format type. </summary>
-    public readonly partial struct RecordingFormatType : IEquatable<RecordingFormatType>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="RecordingFormatType"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public RecordingFormatType(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string WavValue = "Wav";
-        private const string Mp3Value = "Mp3";
-        private const string Mp4Value = "Mp4";
-
-        /// <summary> WAV format. </summary>
-        public static RecordingFormatType Wav { get; } = new RecordingFormatType(WavValue);
-        /// <summary> MP3 format. </summary>
-        public static RecordingFormatType Mp3 { get; } = new RecordingFormatType(Mp3Value);
-        /// <summary> MP4 format. </summary>
-        public static RecordingFormatType Mp4 { get; } = new RecordingFormatType(Mp4Value);
-        /// <summary> Determines if two <see cref="RecordingFormatType"/> values are the same. </summary>
-        public static bool operator ==(RecordingFormatType left, RecordingFormatType right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="RecordingFormatType"/> values are not the same. </summary>
-        public static bool operator !=(RecordingFormatType left, RecordingFormatType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="RecordingFormatType"/>. </summary>
-        public static implicit operator RecordingFormatType(string value) => new RecordingFormatType(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is RecordingFormatType other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(RecordingFormatType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisExportRDBCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisExportRDBCompletedEventData.Serialization.cs
deleted file mode 100644
index 371ef947d88d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisExportRDBCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class RedisExportRDBCompletedEventData : IUtf8JsonSerializable, IJsonModel<RedisExportRDBCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RedisExportRDBCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<RedisExportRDBCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisExportRDBCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RedisExportRDBCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        RedisExportRDBCompletedEventData IJsonModel<RedisExportRDBCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisExportRDBCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RedisExportRDBCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRedisExportRDBCompletedEventData(document.RootElement, options);
-        }
-
-        internal static RedisExportRDBCompletedEventData DeserializeRedisExportRDBCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string name = default;
-            string status = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new RedisExportRDBCompletedEventData(timestamp, name, status, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<RedisExportRDBCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisExportRDBCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(RedisExportRDBCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        RedisExportRDBCompletedEventData IPersistableModel<RedisExportRDBCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisExportRDBCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeRedisExportRDBCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(RedisExportRDBCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<RedisExportRDBCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static RedisExportRDBCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeRedisExportRDBCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisExportRDBCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisExportRDBCompletedEventData.cs
deleted file mode 100644
index 4d02e07eeb4c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisExportRDBCompletedEventData.cs
+++ /dev/null
@@ -1,80 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Cache.ExportRDBCompleted event. </summary>
-    public partial class RedisExportRDBCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="RedisExportRDBCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        internal RedisExportRDBCompletedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RedisExportRDBCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="name"> The name of this event. </param>
-        /// <param name="status"> The status of this event. Failed or  succeeded. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal RedisExportRDBCompletedEventData(DateTimeOffset timestamp, string name, string status, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            Name = name;
-            Status = status;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RedisExportRDBCompletedEventData"/> for deserialization. </summary>
-        internal RedisExportRDBCompletedEventData()
-        {
-        }
-
-        /// <summary> The time at which the event occurred. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The name of this event. </summary>
-        public string Name { get; }
-        /// <summary> The status of this event. Failed or  succeeded. </summary>
-        public string Status { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisImportRDBCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisImportRDBCompletedEventData.Serialization.cs
deleted file mode 100644
index 1e4a780d09d4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisImportRDBCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class RedisImportRDBCompletedEventData : IUtf8JsonSerializable, IJsonModel<RedisImportRDBCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RedisImportRDBCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<RedisImportRDBCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisImportRDBCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RedisImportRDBCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        RedisImportRDBCompletedEventData IJsonModel<RedisImportRDBCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisImportRDBCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RedisImportRDBCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRedisImportRDBCompletedEventData(document.RootElement, options);
-        }
-
-        internal static RedisImportRDBCompletedEventData DeserializeRedisImportRDBCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string name = default;
-            string status = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new RedisImportRDBCompletedEventData(timestamp, name, status, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<RedisImportRDBCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisImportRDBCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(RedisImportRDBCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        RedisImportRDBCompletedEventData IPersistableModel<RedisImportRDBCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisImportRDBCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeRedisImportRDBCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(RedisImportRDBCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<RedisImportRDBCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static RedisImportRDBCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeRedisImportRDBCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisImportRDBCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisImportRDBCompletedEventData.cs
deleted file mode 100644
index 58ca83a77ce3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisImportRDBCompletedEventData.cs
+++ /dev/null
@@ -1,80 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Cache.ImportRDBCompleted event. </summary>
-    public partial class RedisImportRDBCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="RedisImportRDBCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        internal RedisImportRDBCompletedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RedisImportRDBCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="name"> The name of this event. </param>
-        /// <param name="status"> The status of this event. Failed or  succeeded. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal RedisImportRDBCompletedEventData(DateTimeOffset timestamp, string name, string status, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            Name = name;
-            Status = status;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RedisImportRDBCompletedEventData"/> for deserialization. </summary>
-        internal RedisImportRDBCompletedEventData()
-        {
-        }
-
-        /// <summary> The time at which the event occurred. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The name of this event. </summary>
-        public string Name { get; }
-        /// <summary> The status of this event. Failed or  succeeded. </summary>
-        public string Status { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisPatchingCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisPatchingCompletedEventData.Serialization.cs
deleted file mode 100644
index 345b18790fea..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisPatchingCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class RedisPatchingCompletedEventData : IUtf8JsonSerializable, IJsonModel<RedisPatchingCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RedisPatchingCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<RedisPatchingCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisPatchingCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RedisPatchingCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        RedisPatchingCompletedEventData IJsonModel<RedisPatchingCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisPatchingCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RedisPatchingCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRedisPatchingCompletedEventData(document.RootElement, options);
-        }
-
-        internal static RedisPatchingCompletedEventData DeserializeRedisPatchingCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string name = default;
-            string status = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new RedisPatchingCompletedEventData(timestamp, name, status, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<RedisPatchingCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisPatchingCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(RedisPatchingCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        RedisPatchingCompletedEventData IPersistableModel<RedisPatchingCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisPatchingCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeRedisPatchingCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(RedisPatchingCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<RedisPatchingCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static RedisPatchingCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeRedisPatchingCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisPatchingCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisPatchingCompletedEventData.cs
deleted file mode 100644
index 0497287ee8e2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisPatchingCompletedEventData.cs
+++ /dev/null
@@ -1,80 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Cache.PatchingCompleted event. </summary>
-    public partial class RedisPatchingCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="RedisPatchingCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        internal RedisPatchingCompletedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RedisPatchingCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="name"> The name of this event. </param>
-        /// <param name="status"> The status of this event. Failed or  succeeded. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal RedisPatchingCompletedEventData(DateTimeOffset timestamp, string name, string status, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            Name = name;
-            Status = status;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RedisPatchingCompletedEventData"/> for deserialization. </summary>
-        internal RedisPatchingCompletedEventData()
-        {
-        }
-
-        /// <summary> The time at which the event occurred. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The name of this event. </summary>
-        public string Name { get; }
-        /// <summary> The status of this event. Failed or  succeeded. </summary>
-        public string Status { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisScalingCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisScalingCompletedEventData.Serialization.cs
deleted file mode 100644
index 9fd879604e0f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisScalingCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class RedisScalingCompletedEventData : IUtf8JsonSerializable, IJsonModel<RedisScalingCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RedisScalingCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<RedisScalingCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisScalingCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RedisScalingCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        RedisScalingCompletedEventData IJsonModel<RedisScalingCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisScalingCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RedisScalingCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRedisScalingCompletedEventData(document.RootElement, options);
-        }
-
-        internal static RedisScalingCompletedEventData DeserializeRedisScalingCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string name = default;
-            string status = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new RedisScalingCompletedEventData(timestamp, name, status, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<RedisScalingCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisScalingCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(RedisScalingCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        RedisScalingCompletedEventData IPersistableModel<RedisScalingCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RedisScalingCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeRedisScalingCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(RedisScalingCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<RedisScalingCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static RedisScalingCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeRedisScalingCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisScalingCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisScalingCompletedEventData.cs
deleted file mode 100644
index 0d7b4896c816..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/RedisScalingCompletedEventData.cs
+++ /dev/null
@@ -1,80 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Cache.ScalingCompleted event. </summary>
-    public partial class RedisScalingCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="RedisScalingCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        internal RedisScalingCompletedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RedisScalingCompletedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="name"> The name of this event. </param>
-        /// <param name="status"> The status of this event. Failed or  succeeded. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal RedisScalingCompletedEventData(DateTimeOffset timestamp, string name, string status, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            Name = name;
-            Status = status;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RedisScalingCompletedEventData"/> for deserialization. </summary>
-        internal RedisScalingCompletedEventData()
-        {
-        }
-
-        /// <summary> The time at which the event occurred. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The name of this event. </summary>
-        public string Name { get; }
-        /// <summary> The status of this event. Failed or  succeeded. </summary>
-        public string Status { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionCancelEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionCancelEventData.Serialization.cs
deleted file mode 100644
index 6b50c3144e5e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionCancelEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceActionCancelEventData : IUtf8JsonSerializable, IJsonModel<ResourceActionCancelEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceActionCancelEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceActionCancelEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceActionCancelEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceActionCancelEventData IJsonModel<ResourceActionCancelEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceActionCancelEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceActionCancelEventData(document.RootElement, options);
-        }
-
-        internal static ResourceActionCancelEventData DeserializeResourceActionCancelEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceActionCancelEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceActionCancelEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceActionCancelEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceActionCancelEventData IPersistableModel<ResourceActionCancelEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceActionCancelEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceActionCancelEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceActionCancelEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceActionCancelEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceActionCancelEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionCancelEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionCancelEventData.cs
deleted file mode 100644
index 46f2982bb96f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionCancelEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceActionCancel event. This is raised when a resource action operation is canceled. </summary>
-    public partial class ResourceActionCancelEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionCancelEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceActionCancelEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionCancelEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceActionCancelEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionCancelEventData"/> for deserialization. </summary>
-        internal ResourceActionCancelEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionFailureEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionFailureEventData.Serialization.cs
deleted file mode 100644
index 4b82333449f9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionFailureEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceActionFailureEventData : IUtf8JsonSerializable, IJsonModel<ResourceActionFailureEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceActionFailureEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceActionFailureEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceActionFailureEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceActionFailureEventData IJsonModel<ResourceActionFailureEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceActionFailureEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceActionFailureEventData(document.RootElement, options);
-        }
-
-        internal static ResourceActionFailureEventData DeserializeResourceActionFailureEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceActionFailureEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceActionFailureEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceActionFailureEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceActionFailureEventData IPersistableModel<ResourceActionFailureEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceActionFailureEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceActionFailureEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceActionFailureEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceActionFailureEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceActionFailureEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionFailureEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionFailureEventData.cs
deleted file mode 100644
index 5e4fa19dcbe4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionFailureEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceActionFailure event. This is raised when a resource action operation fails. </summary>
-    public partial class ResourceActionFailureEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionFailureEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceActionFailureEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionFailureEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceActionFailureEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionFailureEventData"/> for deserialization. </summary>
-        internal ResourceActionFailureEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionSuccessEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionSuccessEventData.Serialization.cs
deleted file mode 100644
index c0adc937d03b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionSuccessEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceActionSuccessEventData : IUtf8JsonSerializable, IJsonModel<ResourceActionSuccessEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceActionSuccessEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceActionSuccessEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceActionSuccessEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceActionSuccessEventData IJsonModel<ResourceActionSuccessEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceActionSuccessEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceActionSuccessEventData(document.RootElement, options);
-        }
-
-        internal static ResourceActionSuccessEventData DeserializeResourceActionSuccessEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceActionSuccessEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceActionSuccessEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceActionSuccessEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceActionSuccessEventData IPersistableModel<ResourceActionSuccessEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceActionSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceActionSuccessEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceActionSuccessEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceActionSuccessEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceActionSuccessEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceActionSuccessEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionSuccessEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionSuccessEventData.cs
deleted file mode 100644
index 79202e2ed756..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceActionSuccessEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceActionSuccess event. This is raised when a resource action operation succeeds. </summary>
-    public partial class ResourceActionSuccessEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionSuccessEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceActionSuccessEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionSuccessEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceActionSuccessEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceActionSuccessEventData"/> for deserialization. </summary>
-        internal ResourceActionSuccessEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceAuthorization.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceAuthorization.Serialization.cs
deleted file mode 100644
index 4efe91edbade..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceAuthorization.Serialization.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceAuthorization : IUtf8JsonSerializable, IJsonModel<ResourceAuthorization>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceAuthorization>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceAuthorization>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceAuthorization>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceAuthorization)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Scope))
-            {
-                writer.WritePropertyName("scope"u8);
-                writer.WriteStringValue(Scope);
-            }
-            if (Optional.IsDefined(Action))
-            {
-                writer.WritePropertyName("action"u8);
-                writer.WriteStringValue(Action);
-            }
-            writer.WritePropertyName("evidence"u8);
-            writer.WriteStartObject();
-            foreach (var item in Evidence)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceAuthorization IJsonModel<ResourceAuthorization>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceAuthorization>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceAuthorization)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceAuthorization(document.RootElement, options);
-        }
-
-        internal static ResourceAuthorization DeserializeResourceAuthorization(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string scope = default;
-            string action = default;
-            IReadOnlyDictionary<string, string> evidence = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("scope"u8))
-                {
-                    scope = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("action"u8))
-                {
-                    action = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("evidence"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    evidence = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceAuthorization(scope, action, evidence, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceAuthorization>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceAuthorization>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceAuthorization)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceAuthorization IPersistableModel<ResourceAuthorization>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceAuthorization>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceAuthorization(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceAuthorization)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceAuthorization>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceAuthorization FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceAuthorization(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceAuthorization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceAuthorization.cs
deleted file mode 100644
index 07363e2f1dca..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceAuthorization.cs
+++ /dev/null
@@ -1,83 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The details of the authorization for the resource. </summary>
-    public partial class ResourceAuthorization
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceAuthorization"/>. </summary>
-        /// <param name="evidence"> The evidence for the authorization. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="evidence"/> is null. </exception>
-        internal ResourceAuthorization(IReadOnlyDictionary<string, string> evidence)
-        {
-            Argument.AssertNotNull(evidence, nameof(evidence));
-
-            Evidence = evidence;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceAuthorization"/>. </summary>
-        /// <param name="scope"> The scope of the authorization. </param>
-        /// <param name="action"> The action being requested. </param>
-        /// <param name="evidence"> The evidence for the authorization. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceAuthorization(string scope, string action, IReadOnlyDictionary<string, string> evidence, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Scope = scope;
-            Action = action;
-            Evidence = evidence;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceAuthorization"/> for deserialization. </summary>
-        internal ResourceAuthorization()
-        {
-        }
-
-        /// <summary> The scope of the authorization. </summary>
-        public string Scope { get; }
-        /// <summary> The action being requested. </summary>
-        public string Action { get; }
-        /// <summary> The evidence for the authorization. </summary>
-        public IReadOnlyDictionary<string, string> Evidence { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteCancelEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteCancelEventData.Serialization.cs
deleted file mode 100644
index 86538ec5f688..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteCancelEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceDeleteCancelEventData : IUtf8JsonSerializable, IJsonModel<ResourceDeleteCancelEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceDeleteCancelEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceDeleteCancelEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceDeleteCancelEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceDeleteCancelEventData IJsonModel<ResourceDeleteCancelEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceDeleteCancelEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceDeleteCancelEventData(document.RootElement, options);
-        }
-
-        internal static ResourceDeleteCancelEventData DeserializeResourceDeleteCancelEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceDeleteCancelEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceDeleteCancelEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceDeleteCancelEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceDeleteCancelEventData IPersistableModel<ResourceDeleteCancelEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceDeleteCancelEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceDeleteCancelEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceDeleteCancelEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceDeleteCancelEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceDeleteCancelEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteCancelEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteCancelEventData.cs
deleted file mode 100644
index 8cb3102987a2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteCancelEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceDeleteCancel event. This is raised when a resource delete operation is canceled. </summary>
-    public partial class ResourceDeleteCancelEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteCancelEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceDeleteCancelEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteCancelEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceDeleteCancelEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteCancelEventData"/> for deserialization. </summary>
-        internal ResourceDeleteCancelEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteFailureEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteFailureEventData.Serialization.cs
deleted file mode 100644
index 802854fbfde6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteFailureEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceDeleteFailureEventData : IUtf8JsonSerializable, IJsonModel<ResourceDeleteFailureEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceDeleteFailureEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceDeleteFailureEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceDeleteFailureEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceDeleteFailureEventData IJsonModel<ResourceDeleteFailureEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceDeleteFailureEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceDeleteFailureEventData(document.RootElement, options);
-        }
-
-        internal static ResourceDeleteFailureEventData DeserializeResourceDeleteFailureEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceDeleteFailureEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceDeleteFailureEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceDeleteFailureEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceDeleteFailureEventData IPersistableModel<ResourceDeleteFailureEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceDeleteFailureEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceDeleteFailureEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceDeleteFailureEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceDeleteFailureEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceDeleteFailureEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteFailureEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteFailureEventData.cs
deleted file mode 100644
index 310e6916852e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteFailureEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceDeleteFailure event. This is raised when a resource delete operation fails. </summary>
-    public partial class ResourceDeleteFailureEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteFailureEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceDeleteFailureEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteFailureEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceDeleteFailureEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteFailureEventData"/> for deserialization. </summary>
-        internal ResourceDeleteFailureEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteSuccessEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteSuccessEventData.Serialization.cs
deleted file mode 100644
index 610475ad4de2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteSuccessEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceDeleteSuccessEventData : IUtf8JsonSerializable, IJsonModel<ResourceDeleteSuccessEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceDeleteSuccessEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceDeleteSuccessEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceDeleteSuccessEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceDeleteSuccessEventData IJsonModel<ResourceDeleteSuccessEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceDeleteSuccessEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceDeleteSuccessEventData(document.RootElement, options);
-        }
-
-        internal static ResourceDeleteSuccessEventData DeserializeResourceDeleteSuccessEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceDeleteSuccessEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceDeleteSuccessEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceDeleteSuccessEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceDeleteSuccessEventData IPersistableModel<ResourceDeleteSuccessEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceDeleteSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceDeleteSuccessEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceDeleteSuccessEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceDeleteSuccessEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceDeleteSuccessEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceDeleteSuccessEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteSuccessEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteSuccessEventData.cs
deleted file mode 100644
index 990f8c2c3c32..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceDeleteSuccessEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceDeleteSuccess event. This is raised when a resource delete operation succeeds. </summary>
-    public partial class ResourceDeleteSuccessEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteSuccessEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceDeleteSuccessEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteSuccessEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceDeleteSuccessEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceDeleteSuccessEventData"/> for deserialization. </summary>
-        internal ResourceDeleteSuccessEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceHttpRequest.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceHttpRequest.Serialization.cs
deleted file mode 100644
index 578c595a0979..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceHttpRequest.Serialization.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceHttpRequest : IUtf8JsonSerializable, IJsonModel<ResourceHttpRequest>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceHttpRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceHttpRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceHttpRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceHttpRequest)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(ClientIpAddress))
-            {
-                writer.WritePropertyName("clientIpAddress"u8);
-                writer.WriteStringValue(ClientIpAddress);
-            }
-            if (Optional.IsDefined(Method))
-            {
-                writer.WritePropertyName("method"u8);
-                writer.WriteStringValue(Method);
-            }
-            if (Optional.IsDefined(Url))
-            {
-                writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Url);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceHttpRequest IJsonModel<ResourceHttpRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceHttpRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceHttpRequest)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceHttpRequest(document.RootElement, options);
-        }
-
-        internal static ResourceHttpRequest DeserializeResourceHttpRequest(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string clientRequestId = default;
-            string clientIpAddress = default;
-            string method = default;
-            string url = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientIpAddress"u8))
-                {
-                    clientIpAddress = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("method"u8))
-                {
-                    method = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("url"u8))
-                {
-                    url = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceHttpRequest(clientRequestId, clientIpAddress, method, url, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceHttpRequest>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceHttpRequest>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceHttpRequest)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceHttpRequest IPersistableModel<ResourceHttpRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceHttpRequest>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceHttpRequest(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceHttpRequest)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceHttpRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceHttpRequest FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceHttpRequest(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceHttpRequest.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceHttpRequest.cs
deleted file mode 100644
index 4b9db7b6c94b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceHttpRequest.cs
+++ /dev/null
@@ -1,77 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The details of the HTTP request. </summary>
-    public partial class ResourceHttpRequest
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceHttpRequest"/>. </summary>
-        internal ResourceHttpRequest()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceHttpRequest"/>. </summary>
-        /// <param name="clientRequestId"> The client request ID. </param>
-        /// <param name="clientIpAddress"> The client IP address. </param>
-        /// <param name="method"> The request method. </param>
-        /// <param name="url"> The url used in the request. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceHttpRequest(string clientRequestId, string clientIpAddress, string method, string url, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ClientRequestId = clientRequestId;
-            ClientIpAddress = clientIpAddress;
-            Method = method;
-            Url = url;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The client request ID. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The client IP address. </summary>
-        public string ClientIpAddress { get; }
-        /// <summary> The request method. </summary>
-        public string Method { get; }
-        /// <summary> The url used in the request. </summary>
-        public string Url { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAnnotatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAnnotatedEventData.Serialization.cs
deleted file mode 100644
index dba464b1c155..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAnnotatedEventData.Serialization.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsHealthResourcesAnnotatedEventData : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsHealthResourcesAnnotatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsHealthResourcesAnnotatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsHealthResourcesAnnotatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsHealthResourcesAnnotatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsHealthResourcesAnnotatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ResourceNotificationsHealthResourcesAnnotatedEventData IJsonModel<ResourceNotificationsHealthResourcesAnnotatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsHealthResourcesAnnotatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsHealthResourcesAnnotatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsHealthResourcesAnnotatedEventData(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsHealthResourcesAnnotatedEventData DeserializeResourceNotificationsHealthResourcesAnnotatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            ResourceNotificationsResourceUpdatedDetails resourceInfo = default;
-            ResourceNotificationsOperationalDetails operationalInfo = default;
-            string apiVersion = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceInfo"u8))
-                {
-                    resourceInfo = ResourceNotificationsResourceUpdatedDetails.DeserializeResourceNotificationsResourceUpdatedDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("operationalInfo"u8))
-                {
-                    operationalInfo = ResourceNotificationsOperationalDetails.DeserializeResourceNotificationsOperationalDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("apiVersion"u8))
-                {
-                    apiVersion = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsHealthResourcesAnnotatedEventData(resourceInfo, operationalInfo, apiVersion, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsHealthResourcesAnnotatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsHealthResourcesAnnotatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsHealthResourcesAnnotatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsHealthResourcesAnnotatedEventData IPersistableModel<ResourceNotificationsHealthResourcesAnnotatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsHealthResourcesAnnotatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsHealthResourcesAnnotatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsHealthResourcesAnnotatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsHealthResourcesAnnotatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ResourceNotificationsHealthResourcesAnnotatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsHealthResourcesAnnotatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAnnotatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAnnotatedEventData.cs
deleted file mode 100644
index f4b757f2f691..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAnnotatedEventData.cs
+++ /dev/null
@@ -1,43 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Schema of the Data property of an EventGridEvent for a
-    /// Microsoft.ResourceNotifications.HealthResources.ResourceAnnotated event.
-    /// </summary>
-    public partial class ResourceNotificationsHealthResourcesAnnotatedEventData : ResourceNotificationsResourceUpdatedEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsHealthResourcesAnnotatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="resourceDetails"/> or <paramref name="operationalDetails"/> is null. </exception>
-        internal ResourceNotificationsHealthResourcesAnnotatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails) : base(resourceDetails, operationalDetails)
-        {
-            Argument.AssertNotNull(resourceDetails, nameof(resourceDetails));
-            Argument.AssertNotNull(operationalDetails, nameof(operationalDetails));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsHealthResourcesAnnotatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="apiVersion"> api version of the resource properties bag. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsHealthResourcesAnnotatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails, string apiVersion, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(resourceDetails, operationalDetails, apiVersion, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsHealthResourcesAnnotatedEventData"/> for deserialization. </summary>
-        internal ResourceNotificationsHealthResourcesAnnotatedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData.Serialization.cs
deleted file mode 100644
index 6a60d795bdde..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData.Serialization.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData IJsonModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData DeserializeResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            ResourceNotificationsResourceUpdatedDetails resourceInfo = default;
-            ResourceNotificationsOperationalDetails operationalInfo = default;
-            string apiVersion = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceInfo"u8))
-                {
-                    resourceInfo = ResourceNotificationsResourceUpdatedDetails.DeserializeResourceNotificationsResourceUpdatedDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("operationalInfo"u8))
-                {
-                    operationalInfo = ResourceNotificationsOperationalDetails.DeserializeResourceNotificationsOperationalDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("apiVersion"u8))
-                {
-                    apiVersion = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(resourceInfo, operationalInfo, apiVersion, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData IPersistableModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData.cs
deleted file mode 100644
index 8bcffeb43c47..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData.cs
+++ /dev/null
@@ -1,44 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Schema of the Data property of an EventGridEvent for a
-    /// Microsoft.ResourceNotifications.HealthResources.AvailabilityStatusChanged
-    /// event.
-    /// </summary>
-    public partial class ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData : ResourceNotificationsResourceUpdatedEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="resourceDetails"/> or <paramref name="operationalDetails"/> is null. </exception>
-        internal ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails) : base(resourceDetails, operationalDetails)
-        {
-            Argument.AssertNotNull(resourceDetails, nameof(resourceDetails));
-            Argument.AssertNotNull(operationalDetails, nameof(operationalDetails));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="apiVersion"> api version of the resource properties bag. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails, string apiVersion, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(resourceDetails, operationalDetails, apiVersion, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData"/> for deserialization. </summary>
-        internal ResourceNotificationsHealthResourcesAvailabilityStatusChangedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsOperationalDetails.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsOperationalDetails.Serialization.cs
deleted file mode 100644
index 3c02399992e2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsOperationalDetails.Serialization.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsOperationalDetails : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsOperationalDetails>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsOperationalDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsOperationalDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsOperationalDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsOperationalDetails)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("resourceEventTime"u8);
-            writer.WriteStringValue(ResourceEventTime, "O");
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceNotificationsOperationalDetails IJsonModel<ResourceNotificationsOperationalDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsOperationalDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsOperationalDetails)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsOperationalDetails(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsOperationalDetails DeserializeResourceNotificationsOperationalDetails(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset resourceEventTime = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceEventTime"u8))
-                {
-                    resourceEventTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsOperationalDetails(resourceEventTime, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsOperationalDetails>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsOperationalDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsOperationalDetails)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsOperationalDetails IPersistableModel<ResourceNotificationsOperationalDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsOperationalDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsOperationalDetails(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsOperationalDetails)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsOperationalDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceNotificationsOperationalDetails FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsOperationalDetails(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsOperationalDetails.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsOperationalDetails.cs
deleted file mode 100644
index a55f436fa035..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsOperationalDetails.cs
+++ /dev/null
@@ -1,72 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> details of operational info. </summary>
-    public partial class ResourceNotificationsOperationalDetails
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsOperationalDetails"/>. </summary>
-        /// <param name="resourceEventTime"> Date and Time when resource was updated. </param>
-        internal ResourceNotificationsOperationalDetails(DateTimeOffset resourceEventTime)
-        {
-            ResourceEventTime = resourceEventTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsOperationalDetails"/>. </summary>
-        /// <param name="resourceEventTime"> Date and Time when resource was updated. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsOperationalDetails(DateTimeOffset resourceEventTime, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceEventTime = resourceEventTime;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsOperationalDetails"/> for deserialization. </summary>
-        internal ResourceNotificationsOperationalDetails()
-        {
-        }
-
-        /// <summary> Date and Time when resource was updated. </summary>
-        public DateTimeOffset ResourceEventTime { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedDetails.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedDetails.Serialization.cs
deleted file mode 100644
index f55a187c67ac..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedDetails.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsResourceDeletedDetails : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsResourceDeletedDetails>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsResourceDeletedDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsResourceDeletedDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceDeletedDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceDeletedDetails)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Type))
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceNotificationsResourceDeletedDetails IJsonModel<ResourceNotificationsResourceDeletedDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceDeletedDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceDeletedDetails)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsResourceDeletedDetails(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsResourceDeletedDetails DeserializeResourceNotificationsResourceDeletedDetails(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string name = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsResourceDeletedDetails(id, name, type, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsResourceDeletedDetails>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceDeletedDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceDeletedDetails)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsResourceDeletedDetails IPersistableModel<ResourceNotificationsResourceDeletedDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceDeletedDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsResourceDeletedDetails(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceDeletedDetails)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsResourceDeletedDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceNotificationsResourceDeletedDetails FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsResourceDeletedDetails(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedDetails.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedDetails.cs
deleted file mode 100644
index cf7a4a0ccdf0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedDetails.cs
+++ /dev/null
@@ -1,76 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Describes the schema of the properties under resource info which are common
-    /// across all ARN system topic delete events
-    /// </summary>
-    public partial class ResourceNotificationsResourceDeletedDetails
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceDeletedDetails"/>. </summary>
-        internal ResourceNotificationsResourceDeletedDetails()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceDeletedDetails"/>. </summary>
-        /// <param name="id"> id of the resource for which the event is being emitted. </param>
-        /// <param name="name"> name of the resource for which the event is being emitted. </param>
-        /// <param name="type"> the type of the resource for which the event is being emitted. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsResourceDeletedDetails(string id, string name, string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            Name = name;
-            Type = type;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> id of the resource for which the event is being emitted. </summary>
-        public string Id { get; }
-        /// <summary> name of the resource for which the event is being emitted. </summary>
-        public string Name { get; }
-        /// <summary> the type of the resource for which the event is being emitted. </summary>
-        public string Type { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedEventData.Serialization.cs
deleted file mode 100644
index 2eb550fbc8ae..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsResourceDeletedEventData : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsResourceDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsResourceDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsResourceDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("resourceInfo"u8);
-            writer.WriteObjectValue(ResourceDetails, options);
-            writer.WritePropertyName("operationalInfo"u8);
-            writer.WriteObjectValue(OperationalDetails, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceNotificationsResourceDeletedEventData IJsonModel<ResourceNotificationsResourceDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsResourceDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsResourceDeletedEventData DeserializeResourceNotificationsResourceDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            ResourceNotificationsResourceDeletedDetails resourceInfo = default;
-            ResourceNotificationsOperationalDetails operationalInfo = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceInfo"u8))
-                {
-                    resourceInfo = ResourceNotificationsResourceDeletedDetails.DeserializeResourceNotificationsResourceDeletedDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("operationalInfo"u8))
-                {
-                    operationalInfo = ResourceNotificationsOperationalDetails.DeserializeResourceNotificationsOperationalDetails(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsResourceDeletedEventData(resourceInfo, operationalInfo, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsResourceDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsResourceDeletedEventData IPersistableModel<ResourceNotificationsResourceDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsResourceDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsResourceDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceNotificationsResourceDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsResourceDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedEventData.cs
deleted file mode 100644
index 5dee76cd0d52..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceDeletedEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Describes the schema of the common properties across all ARN system topic
-    /// delete events
-    /// </summary>
-    public partial class ResourceNotificationsResourceDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceDeletedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for delete event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="resourceDetails"/> or <paramref name="operationalDetails"/> is null. </exception>
-        internal ResourceNotificationsResourceDeletedEventData(ResourceNotificationsResourceDeletedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails)
-        {
-            Argument.AssertNotNull(resourceDetails, nameof(resourceDetails));
-            Argument.AssertNotNull(operationalDetails, nameof(operationalDetails));
-
-            ResourceDetails = resourceDetails;
-            OperationalDetails = operationalDetails;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceDeletedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for delete event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsResourceDeletedEventData(ResourceNotificationsResourceDeletedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceDetails = resourceDetails;
-            OperationalDetails = operationalDetails;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceDeletedEventData"/> for deserialization. </summary>
-        internal ResourceNotificationsResourceDeletedEventData()
-        {
-        }
-
-        /// <summary> resourceInfo details for delete event. </summary>
-        public ResourceNotificationsResourceDeletedDetails ResourceDetails { get; }
-        /// <summary> details about operational info. </summary>
-        public ResourceNotificationsOperationalDetails OperationalDetails { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementCreatedOrUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementCreatedOrUpdatedEventData.Serialization.cs
deleted file mode 100644
index 403063ecdb2e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementCreatedOrUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsResourceManagementCreatedOrUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceManagementCreatedOrUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ResourceNotificationsResourceManagementCreatedOrUpdatedEventData IJsonModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceManagementCreatedOrUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsResourceManagementCreatedOrUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsResourceManagementCreatedOrUpdatedEventData DeserializeResourceNotificationsResourceManagementCreatedOrUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            ResourceNotificationsResourceUpdatedDetails resourceInfo = default;
-            ResourceNotificationsOperationalDetails operationalInfo = default;
-            string apiVersion = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceInfo"u8))
-                {
-                    resourceInfo = ResourceNotificationsResourceUpdatedDetails.DeserializeResourceNotificationsResourceUpdatedDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("operationalInfo"u8))
-                {
-                    operationalInfo = ResourceNotificationsOperationalDetails.DeserializeResourceNotificationsOperationalDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("apiVersion"u8))
-                {
-                    apiVersion = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsResourceManagementCreatedOrUpdatedEventData(resourceInfo, operationalInfo, apiVersion, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceManagementCreatedOrUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsResourceManagementCreatedOrUpdatedEventData IPersistableModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsResourceManagementCreatedOrUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceManagementCreatedOrUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsResourceManagementCreatedOrUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ResourceNotificationsResourceManagementCreatedOrUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsResourceManagementCreatedOrUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementCreatedOrUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementCreatedOrUpdatedEventData.cs
deleted file mode 100644
index 6b62866b0201..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementCreatedOrUpdatedEventData.cs
+++ /dev/null
@@ -1,43 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Schema of the Data property of an EventGridEvent for a
-    /// Microsoft.ResourceNotifications.Resources.CreatedOrUpdated event.
-    /// </summary>
-    public partial class ResourceNotificationsResourceManagementCreatedOrUpdatedEventData : ResourceNotificationsResourceUpdatedEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceManagementCreatedOrUpdatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="resourceDetails"/> or <paramref name="operationalDetails"/> is null. </exception>
-        internal ResourceNotificationsResourceManagementCreatedOrUpdatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails) : base(resourceDetails, operationalDetails)
-        {
-            Argument.AssertNotNull(resourceDetails, nameof(resourceDetails));
-            Argument.AssertNotNull(operationalDetails, nameof(operationalDetails));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceManagementCreatedOrUpdatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="apiVersion"> api version of the resource properties bag. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsResourceManagementCreatedOrUpdatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails, string apiVersion, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(resourceDetails, operationalDetails, apiVersion, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceManagementCreatedOrUpdatedEventData"/> for deserialization. </summary>
-        internal ResourceNotificationsResourceManagementCreatedOrUpdatedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementDeletedEventData.Serialization.cs
deleted file mode 100644
index 3d3b7ae70567..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsResourceManagementDeletedEventData : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsResourceManagementDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsResourceManagementDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsResourceManagementDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceManagementDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceManagementDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        ResourceNotificationsResourceManagementDeletedEventData IJsonModel<ResourceNotificationsResourceManagementDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceManagementDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceManagementDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsResourceManagementDeletedEventData(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsResourceManagementDeletedEventData DeserializeResourceNotificationsResourceManagementDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            ResourceNotificationsResourceDeletedDetails resourceInfo = default;
-            ResourceNotificationsOperationalDetails operationalInfo = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceInfo"u8))
-                {
-                    resourceInfo = ResourceNotificationsResourceDeletedDetails.DeserializeResourceNotificationsResourceDeletedDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("operationalInfo"u8))
-                {
-                    operationalInfo = ResourceNotificationsOperationalDetails.DeserializeResourceNotificationsOperationalDetails(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsResourceManagementDeletedEventData(resourceInfo, operationalInfo, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsResourceManagementDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceManagementDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceManagementDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsResourceManagementDeletedEventData IPersistableModel<ResourceNotificationsResourceManagementDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceManagementDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsResourceManagementDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceManagementDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsResourceManagementDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new ResourceNotificationsResourceManagementDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsResourceManagementDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementDeletedEventData.cs
deleted file mode 100644
index 78e118f95d49..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceManagementDeletedEventData.cs
+++ /dev/null
@@ -1,42 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Schema of the Data property of an EventGridEvent for a
-    /// Microsoft.ResourceNotifications.Resources.Deleted event.
-    /// </summary>
-    public partial class ResourceNotificationsResourceManagementDeletedEventData : ResourceNotificationsResourceDeletedEventData
-    {
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceManagementDeletedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for delete event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="resourceDetails"/> or <paramref name="operationalDetails"/> is null. </exception>
-        internal ResourceNotificationsResourceManagementDeletedEventData(ResourceNotificationsResourceDeletedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails) : base(resourceDetails, operationalDetails)
-        {
-            Argument.AssertNotNull(resourceDetails, nameof(resourceDetails));
-            Argument.AssertNotNull(operationalDetails, nameof(operationalDetails));
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceManagementDeletedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for delete event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsResourceManagementDeletedEventData(ResourceNotificationsResourceDeletedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(resourceDetails, operationalDetails, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceManagementDeletedEventData"/> for deserialization. </summary>
-        internal ResourceNotificationsResourceManagementDeletedEventData()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedDetails.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedDetails.Serialization.cs
deleted file mode 100644
index 72e405e281d4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedDetails.Serialization.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsResourceUpdatedDetails : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsResourceUpdatedDetails>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsResourceUpdatedDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsResourceUpdatedDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceUpdatedDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceUpdatedDetails)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Id))
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Type))
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (Optional.IsDefined(Location))
-            {
-                writer.WritePropertyName("location"u8);
-                writer.WriteStringValue(Location);
-            }
-            writer.WritePropertyName("tags"u8);
-            writer.WriteStartObject();
-            foreach (var item in Tags)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            foreach (var item in Properties)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceNotificationsResourceUpdatedDetails IJsonModel<ResourceNotificationsResourceUpdatedDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceUpdatedDetails>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceUpdatedDetails)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsResourceUpdatedDetails(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsResourceUpdatedDetails DeserializeResourceNotificationsResourceUpdatedDetails(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            string name = default;
-            string type = default;
-            string location = default;
-            IReadOnlyDictionary<string, string> tags = default;
-            IReadOnlyDictionary<string, BinaryData> properties = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("location"u8))
-                {
-                    location = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("tags"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    tags = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    properties = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsResourceUpdatedDetails(
-                id,
-                name,
-                type,
-                location,
-                tags,
-                properties,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsResourceUpdatedDetails>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceUpdatedDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceUpdatedDetails)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsResourceUpdatedDetails IPersistableModel<ResourceNotificationsResourceUpdatedDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceUpdatedDetails>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsResourceUpdatedDetails(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceUpdatedDetails)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsResourceUpdatedDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceNotificationsResourceUpdatedDetails FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsResourceUpdatedDetails(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedDetails.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedDetails.cs
deleted file mode 100644
index 59b8832d8be3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedDetails.cs
+++ /dev/null
@@ -1,130 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Describes the schema of the properties under resource info which are common
-    /// across all ARN system topic events
-    /// </summary>
-    public partial class ResourceNotificationsResourceUpdatedDetails
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceUpdatedDetails"/>. </summary>
-        /// <param name="tags"> the tags on the resource for which the event is being emitted. </param>
-        /// <param name="properties"> properties in the payload of the resource for which the event is being emitted. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="tags"/> or <paramref name="properties"/> is null. </exception>
-        internal ResourceNotificationsResourceUpdatedDetails(IReadOnlyDictionary<string, string> tags, IReadOnlyDictionary<string, BinaryData> properties)
-        {
-            Argument.AssertNotNull(tags, nameof(tags));
-            Argument.AssertNotNull(properties, nameof(properties));
-
-            Tags = tags;
-            Properties = properties;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceUpdatedDetails"/>. </summary>
-        /// <param name="id"> id of the resource for which the event is being emitted. </param>
-        /// <param name="name"> name of the resource for which the event is being emitted. </param>
-        /// <param name="type"> the type of the resource for which the event is being emitted. </param>
-        /// <param name="location"> the location of the resource for which the event is being emitted. </param>
-        /// <param name="tags"> the tags on the resource for which the event is being emitted. </param>
-        /// <param name="properties"> properties in the payload of the resource for which the event is being emitted. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsResourceUpdatedDetails(string id, string name, string type, string location, IReadOnlyDictionary<string, string> tags, IReadOnlyDictionary<string, BinaryData> properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            Name = name;
-            Type = type;
-            Location = location;
-            Tags = tags;
-            Properties = properties;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceUpdatedDetails"/> for deserialization. </summary>
-        internal ResourceNotificationsResourceUpdatedDetails()
-        {
-        }
-
-        /// <summary> id of the resource for which the event is being emitted. </summary>
-        public string Id { get; }
-        /// <summary> name of the resource for which the event is being emitted. </summary>
-        public string Name { get; }
-        /// <summary> the type of the resource for which the event is being emitted. </summary>
-        public string Type { get; }
-        /// <summary> the location of the resource for which the event is being emitted. </summary>
-        public string Location { get; }
-        /// <summary> the tags on the resource for which the event is being emitted. </summary>
-        public IReadOnlyDictionary<string, string> Tags { get; }
-        /// <summary>
-        /// properties in the payload of the resource for which the event is being emitted
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> Properties { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedEventData.Serialization.cs
deleted file mode 100644
index bdbca4cbd7fe..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceNotificationsResourceUpdatedEventData : IUtf8JsonSerializable, IJsonModel<ResourceNotificationsResourceUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceNotificationsResourceUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceNotificationsResourceUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("resourceInfo"u8);
-            writer.WriteObjectValue(ResourceDetails, options);
-            writer.WritePropertyName("operationalInfo"u8);
-            writer.WriteObjectValue(OperationalDetails, options);
-            if (Optional.IsDefined(ApiVersion))
-            {
-                writer.WritePropertyName("apiVersion"u8);
-                writer.WriteStringValue(ApiVersion);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceNotificationsResourceUpdatedEventData IJsonModel<ResourceNotificationsResourceUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceNotificationsResourceUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceNotificationsResourceUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static ResourceNotificationsResourceUpdatedEventData DeserializeResourceNotificationsResourceUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            ResourceNotificationsResourceUpdatedDetails resourceInfo = default;
-            ResourceNotificationsOperationalDetails operationalInfo = default;
-            string apiVersion = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("resourceInfo"u8))
-                {
-                    resourceInfo = ResourceNotificationsResourceUpdatedDetails.DeserializeResourceNotificationsResourceUpdatedDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("operationalInfo"u8))
-                {
-                    operationalInfo = ResourceNotificationsOperationalDetails.DeserializeResourceNotificationsOperationalDetails(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("apiVersion"u8))
-                {
-                    apiVersion = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceNotificationsResourceUpdatedEventData(resourceInfo, operationalInfo, apiVersion, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceNotificationsResourceUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceNotificationsResourceUpdatedEventData IPersistableModel<ResourceNotificationsResourceUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceNotificationsResourceUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceNotificationsResourceUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceNotificationsResourceUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceNotificationsResourceUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceNotificationsResourceUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceNotificationsResourceUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedEventData.cs
deleted file mode 100644
index 3bb624a3b0b1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceNotificationsResourceUpdatedEventData.cs
+++ /dev/null
@@ -1,86 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Describes the schema of the common properties across all ARN system topic events. </summary>
-    public partial class ResourceNotificationsResourceUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceUpdatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="resourceDetails"/> or <paramref name="operationalDetails"/> is null. </exception>
-        internal ResourceNotificationsResourceUpdatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails)
-        {
-            Argument.AssertNotNull(resourceDetails, nameof(resourceDetails));
-            Argument.AssertNotNull(operationalDetails, nameof(operationalDetails));
-
-            ResourceDetails = resourceDetails;
-            OperationalDetails = operationalDetails;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceUpdatedEventData"/>. </summary>
-        /// <param name="resourceDetails"> resourceInfo details for update event. </param>
-        /// <param name="operationalDetails"> details about operational info. </param>
-        /// <param name="apiVersion"> api version of the resource properties bag. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceNotificationsResourceUpdatedEventData(ResourceNotificationsResourceUpdatedDetails resourceDetails, ResourceNotificationsOperationalDetails operationalDetails, string apiVersion, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceDetails = resourceDetails;
-            OperationalDetails = operationalDetails;
-            ApiVersion = apiVersion;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceNotificationsResourceUpdatedEventData"/> for deserialization. </summary>
-        internal ResourceNotificationsResourceUpdatedEventData()
-        {
-        }
-
-        /// <summary> resourceInfo details for update event. </summary>
-        public ResourceNotificationsResourceUpdatedDetails ResourceDetails { get; }
-        /// <summary> details about operational info. </summary>
-        public ResourceNotificationsOperationalDetails OperationalDetails { get; }
-        /// <summary> api version of the resource properties bag. </summary>
-        public string ApiVersion { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteCancelEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteCancelEventData.Serialization.cs
deleted file mode 100644
index 9b08a63f70af..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteCancelEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceWriteCancelEventData : IUtf8JsonSerializable, IJsonModel<ResourceWriteCancelEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceWriteCancelEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceWriteCancelEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceWriteCancelEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceWriteCancelEventData IJsonModel<ResourceWriteCancelEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceWriteCancelEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceWriteCancelEventData(document.RootElement, options);
-        }
-
-        internal static ResourceWriteCancelEventData DeserializeResourceWriteCancelEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceWriteCancelEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceWriteCancelEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceWriteCancelEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceWriteCancelEventData IPersistableModel<ResourceWriteCancelEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteCancelEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceWriteCancelEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceWriteCancelEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceWriteCancelEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceWriteCancelEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceWriteCancelEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteCancelEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteCancelEventData.cs
deleted file mode 100644
index 35fce3f2ae9c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteCancelEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceWriteCancel event. This is raised when a resource create or update operation is canceled. </summary>
-    public partial class ResourceWriteCancelEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteCancelEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceWriteCancelEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteCancelEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceWriteCancelEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteCancelEventData"/> for deserialization. </summary>
-        internal ResourceWriteCancelEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteFailureEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteFailureEventData.Serialization.cs
deleted file mode 100644
index cce0e36f154a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteFailureEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceWriteFailureEventData : IUtf8JsonSerializable, IJsonModel<ResourceWriteFailureEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceWriteFailureEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceWriteFailureEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceWriteFailureEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceWriteFailureEventData IJsonModel<ResourceWriteFailureEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceWriteFailureEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceWriteFailureEventData(document.RootElement, options);
-        }
-
-        internal static ResourceWriteFailureEventData DeserializeResourceWriteFailureEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceWriteFailureEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceWriteFailureEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceWriteFailureEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceWriteFailureEventData IPersistableModel<ResourceWriteFailureEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteFailureEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceWriteFailureEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceWriteFailureEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceWriteFailureEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceWriteFailureEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceWriteFailureEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteFailureEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteFailureEventData.cs
deleted file mode 100644
index 782018d8cd16..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteFailureEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceWriteFailure event. This is raised when a resource create or update operation fails. </summary>
-    public partial class ResourceWriteFailureEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteFailureEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceWriteFailureEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteFailureEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceWriteFailureEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteFailureEventData"/> for deserialization. </summary>
-        internal ResourceWriteFailureEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteSuccessEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteSuccessEventData.Serialization.cs
deleted file mode 100644
index 442361ba1b4d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteSuccessEventData.Serialization.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ResourceWriteSuccessEventData : IUtf8JsonSerializable, IJsonModel<ResourceWriteSuccessEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResourceWriteSuccessEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ResourceWriteSuccessEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceWriteSuccessEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TenantId))
-            {
-                writer.WritePropertyName("tenantId"u8);
-                writer.WriteStringValue(TenantId);
-            }
-            if (Optional.IsDefined(SubscriptionId))
-            {
-                writer.WritePropertyName("subscriptionId"u8);
-                writer.WriteStringValue(SubscriptionId);
-            }
-            if (Optional.IsDefined(ResourceGroup))
-            {
-                writer.WritePropertyName("resourceGroup"u8);
-                writer.WriteStringValue(ResourceGroup);
-            }
-            if (Optional.IsDefined(ResourceProvider))
-            {
-                writer.WritePropertyName("resourceProvider"u8);
-                writer.WriteStringValue(ResourceProvider);
-            }
-            if (Optional.IsDefined(ResourceUri))
-            {
-                writer.WritePropertyName("resourceUri"u8);
-                writer.WriteStringValue(ResourceUri);
-            }
-            if (Optional.IsDefined(OperationName))
-            {
-                writer.WritePropertyName("operationName"u8);
-                writer.WriteStringValue(OperationName);
-            }
-            if (Optional.IsDefined(Status))
-            {
-                writer.WritePropertyName("status"u8);
-                writer.WriteStringValue(Status);
-            }
-            writer.WritePropertyName("authorization"u8);
-            writer.WriteObjectValue(Authorization, options);
-            writer.WritePropertyName("claims"u8);
-            writer.WriteStartObject();
-            foreach (var item in Claims)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteStringValue(item.Value);
-            }
-            writer.WriteEndObject();
-            if (Optional.IsDefined(CorrelationId))
-            {
-                writer.WritePropertyName("correlationId"u8);
-                writer.WriteStringValue(CorrelationId);
-            }
-            writer.WritePropertyName("httpRequest"u8);
-            writer.WriteObjectValue(HttpRequest, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ResourceWriteSuccessEventData IJsonModel<ResourceWriteSuccessEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ResourceWriteSuccessEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResourceWriteSuccessEventData(document.RootElement, options);
-        }
-
-        internal static ResourceWriteSuccessEventData DeserializeResourceWriteSuccessEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string tenantId = default;
-            string subscriptionId = default;
-            string resourceGroup = default;
-            string resourceProvider = default;
-            string resourceUri = default;
-            string operationName = default;
-            string status = default;
-            ResourceAuthorization authorization = default;
-            IReadOnlyDictionary<string, string> claims = default;
-            string correlationId = default;
-            ResourceHttpRequest httpRequest = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("tenantId"u8))
-                {
-                    tenantId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionId"u8))
-                {
-                    subscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceGroup"u8))
-                {
-                    resourceGroup = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceProvider"u8))
-                {
-                    resourceProvider = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("resourceUri"u8))
-                {
-                    resourceUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("operationName"u8))
-                {
-                    operationName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("status"u8))
-                {
-                    status = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("authorization"u8))
-                {
-                    authorization = ResourceAuthorization.DeserializeResourceAuthorization(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("claims"u8))
-                {
-                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
-                    }
-                    claims = dictionary;
-                    continue;
-                }
-                if (property.NameEquals("correlationId"u8))
-                {
-                    correlationId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("httpRequest"u8))
-                {
-                    httpRequest = ResourceHttpRequest.DeserializeResourceHttpRequest(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResourceWriteSuccessEventData(
-                tenantId,
-                subscriptionId,
-                resourceGroup,
-                resourceProvider,
-                resourceUri,
-                operationName,
-                status,
-                authorization,
-                claims,
-                correlationId,
-                httpRequest,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ResourceWriteSuccessEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ResourceWriteSuccessEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ResourceWriteSuccessEventData IPersistableModel<ResourceWriteSuccessEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResourceWriteSuccessEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResourceWriteSuccessEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ResourceWriteSuccessEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ResourceWriteSuccessEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ResourceWriteSuccessEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResourceWriteSuccessEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteSuccessEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteSuccessEventData.cs
deleted file mode 100644
index 2a1265b7404a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ResourceWriteSuccessEventData.cs
+++ /dev/null
@@ -1,121 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Resources.ResourceWriteSuccess event. This is raised when a resource create or update operation succeeds. </summary>
-    public partial class ResourceWriteSuccessEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteSuccessEventData"/>. </summary>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="authorization"/>, <paramref name="claims"/> or <paramref name="httpRequest"/> is null. </exception>
-        internal ResourceWriteSuccessEventData(ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, ResourceHttpRequest httpRequest)
-        {
-            Argument.AssertNotNull(authorization, nameof(authorization));
-            Argument.AssertNotNull(claims, nameof(claims));
-            Argument.AssertNotNull(httpRequest, nameof(httpRequest));
-
-            Authorization = authorization;
-            Claims = claims;
-            HttpRequest = httpRequest;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteSuccessEventData"/>. </summary>
-        /// <param name="tenantId"> The tenant ID of the resource. </param>
-        /// <param name="subscriptionId"> The subscription ID of the resource. </param>
-        /// <param name="resourceGroup"> The resource group of the resource. </param>
-        /// <param name="resourceProvider"> The resource provider performing the operation. </param>
-        /// <param name="resourceUri"> The URI of the resource in the operation. </param>
-        /// <param name="operationName"> The operation that was performed. </param>
-        /// <param name="status"> The status of the operation. </param>
-        /// <param name="authorization"> The requested authorization for the operation. </param>
-        /// <param name="claims"> The properties of the claims. </param>
-        /// <param name="correlationId"> An operation ID used for troubleshooting. </param>
-        /// <param name="httpRequest"> The details of the operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResourceWriteSuccessEventData(string tenantId, string subscriptionId, string resourceGroup, string resourceProvider, string resourceUri, string operationName, string status, ResourceAuthorization authorization, IReadOnlyDictionary<string, string> claims, string correlationId, ResourceHttpRequest httpRequest, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TenantId = tenantId;
-            SubscriptionId = subscriptionId;
-            ResourceGroup = resourceGroup;
-            ResourceProvider = resourceProvider;
-            ResourceUri = resourceUri;
-            OperationName = operationName;
-            Status = status;
-            Authorization = authorization;
-            Claims = claims;
-            CorrelationId = correlationId;
-            HttpRequest = httpRequest;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResourceWriteSuccessEventData"/> for deserialization. </summary>
-        internal ResourceWriteSuccessEventData()
-        {
-        }
-
-        /// <summary> The tenant ID of the resource. </summary>
-        public string TenantId { get; }
-        /// <summary> The subscription ID of the resource. </summary>
-        public string SubscriptionId { get; }
-        /// <summary> The resource group of the resource. </summary>
-        public string ResourceGroup { get; }
-        /// <summary> The resource provider performing the operation. </summary>
-        public string ResourceProvider { get; }
-        /// <summary> The URI of the resource in the operation. </summary>
-        public string ResourceUri { get; }
-        /// <summary> The operation that was performed. </summary>
-        public string OperationName { get; }
-        /// <summary> The status of the operation. </summary>
-        public string Status { get; }
-        /// <summary> The requested authorization for the operation. </summary>
-        public ResourceAuthorization Authorization { get; }
-        /// <summary> The properties of the claims. </summary>
-        public IReadOnlyDictionary<string, string> Claims { get; }
-        /// <summary> An operation ID used for troubleshooting. </summary>
-        public string CorrelationId { get; }
-        /// <summary> The details of the operation. </summary>
-        public ResourceHttpRequest HttpRequest { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData.Serialization.cs
deleted file mode 100644
index 93f730db151a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData.Serialization.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData : IUtf8JsonSerializable, IJsonModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(NamespaceName))
-            {
-                writer.WritePropertyName("namespaceName"u8);
-                writer.WriteStringValue(NamespaceName);
-            }
-            if (Optional.IsDefined(RequestUri))
-            {
-                writer.WritePropertyName("requestUri"u8);
-                writer.WriteStringValue(RequestUri);
-            }
-            if (Optional.IsDefined(EntityType))
-            {
-                writer.WritePropertyName("entityType"u8);
-                writer.WriteStringValue(EntityType);
-            }
-            if (Optional.IsDefined(QueueName))
-            {
-                writer.WritePropertyName("queueName"u8);
-                writer.WriteStringValue(QueueName);
-            }
-            if (Optional.IsDefined(TopicName))
-            {
-                writer.WritePropertyName("topicName"u8);
-                writer.WriteStringValue(TopicName);
-            }
-            if (Optional.IsDefined(SubscriptionName))
-            {
-                writer.WritePropertyName("subscriptionName"u8);
-                writer.WriteStringValue(SubscriptionName);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData IJsonModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeServiceBusActiveMessagesAvailablePeriodicNotificationsEventData(document.RootElement, options);
-        }
-
-        internal static ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData DeserializeServiceBusActiveMessagesAvailablePeriodicNotificationsEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string namespaceName = default;
-            string requestUri = default;
-            string entityType = default;
-            string queueName = default;
-            string topicName = default;
-            string subscriptionName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestUri"u8))
-                {
-                    requestUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("entityType"u8))
-                {
-                    entityType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueName"u8))
-                {
-                    queueName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("topicName"u8))
-                {
-                    topicName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionName"u8))
-                {
-                    subscriptionName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData(
-                namespaceName,
-                requestUri,
-                entityType,
-                queueName,
-                topicName,
-                subscriptionName,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData IPersistableModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeServiceBusActiveMessagesAvailablePeriodicNotificationsEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeServiceBusActiveMessagesAvailablePeriodicNotificationsEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData.cs
deleted file mode 100644
index a5b443e63add..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailablePeriodicNotifications event. </summary>
-    public partial class ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData"/>. </summary>
-        internal ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData"/>. </summary>
-        /// <param name="namespaceName"> The namespace name of the Microsoft.ServiceBus resource. </param>
-        /// <param name="requestUri"> The endpoint of the Microsoft.ServiceBus resource. </param>
-        /// <param name="entityType"> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </param>
-        /// <param name="queueName"> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </param>
-        /// <param name="topicName"> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="subscriptionName"> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData(string namespaceName, string requestUri, string entityType, string queueName, string topicName, string subscriptionName, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            NamespaceName = namespaceName;
-            RequestUri = requestUri;
-            EntityType = entityType;
-            QueueName = queueName;
-            TopicName = topicName;
-            SubscriptionName = subscriptionName;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The namespace name of the Microsoft.ServiceBus resource. </summary>
-        public string NamespaceName { get; }
-        /// <summary> The endpoint of the Microsoft.ServiceBus resource. </summary>
-        public string RequestUri { get; }
-        /// <summary> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </summary>
-        public string EntityType { get; }
-        /// <summary> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </summary>
-        public string QueueName { get; }
-        /// <summary> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </summary>
-        public string TopicName { get; }
-        /// <summary> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </summary>
-        public string SubscriptionName { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailableWithNoListenersEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailableWithNoListenersEventData.Serialization.cs
deleted file mode 100644
index 10f23c8c7709..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailableWithNoListenersEventData.Serialization.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ServiceBusActiveMessagesAvailableWithNoListenersEventData : IUtf8JsonSerializable, IJsonModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ServiceBusActiveMessagesAvailableWithNoListenersEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(NamespaceName))
-            {
-                writer.WritePropertyName("namespaceName"u8);
-                writer.WriteStringValue(NamespaceName);
-            }
-            if (Optional.IsDefined(RequestUri))
-            {
-                writer.WritePropertyName("requestUri"u8);
-                writer.WriteStringValue(RequestUri);
-            }
-            if (Optional.IsDefined(EntityType))
-            {
-                writer.WritePropertyName("entityType"u8);
-                writer.WriteStringValue(EntityType);
-            }
-            if (Optional.IsDefined(QueueName))
-            {
-                writer.WritePropertyName("queueName"u8);
-                writer.WriteStringValue(QueueName);
-            }
-            if (Optional.IsDefined(TopicName))
-            {
-                writer.WritePropertyName("topicName"u8);
-                writer.WriteStringValue(TopicName);
-            }
-            if (Optional.IsDefined(SubscriptionName))
-            {
-                writer.WritePropertyName("subscriptionName"u8);
-                writer.WriteStringValue(SubscriptionName);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ServiceBusActiveMessagesAvailableWithNoListenersEventData IJsonModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ServiceBusActiveMessagesAvailableWithNoListenersEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeServiceBusActiveMessagesAvailableWithNoListenersEventData(document.RootElement, options);
-        }
-
-        internal static ServiceBusActiveMessagesAvailableWithNoListenersEventData DeserializeServiceBusActiveMessagesAvailableWithNoListenersEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string namespaceName = default;
-            string requestUri = default;
-            string entityType = default;
-            string queueName = default;
-            string topicName = default;
-            string subscriptionName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestUri"u8))
-                {
-                    requestUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("entityType"u8))
-                {
-                    entityType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueName"u8))
-                {
-                    queueName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("topicName"u8))
-                {
-                    topicName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionName"u8))
-                {
-                    subscriptionName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ServiceBusActiveMessagesAvailableWithNoListenersEventData(
-                namespaceName,
-                requestUri,
-                entityType,
-                queueName,
-                topicName,
-                subscriptionName,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ServiceBusActiveMessagesAvailableWithNoListenersEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ServiceBusActiveMessagesAvailableWithNoListenersEventData IPersistableModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeServiceBusActiveMessagesAvailableWithNoListenersEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ServiceBusActiveMessagesAvailableWithNoListenersEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ServiceBusActiveMessagesAvailableWithNoListenersEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ServiceBusActiveMessagesAvailableWithNoListenersEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeServiceBusActiveMessagesAvailableWithNoListenersEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailableWithNoListenersEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailableWithNoListenersEventData.cs
deleted file mode 100644
index 5b06715deecb..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusActiveMessagesAvailableWithNoListenersEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailableWithNoListeners event. </summary>
-    public partial class ServiceBusActiveMessagesAvailableWithNoListenersEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ServiceBusActiveMessagesAvailableWithNoListenersEventData"/>. </summary>
-        internal ServiceBusActiveMessagesAvailableWithNoListenersEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ServiceBusActiveMessagesAvailableWithNoListenersEventData"/>. </summary>
-        /// <param name="namespaceName"> The namespace name of the Microsoft.ServiceBus resource. </param>
-        /// <param name="requestUri"> The endpoint of the Microsoft.ServiceBus resource. </param>
-        /// <param name="entityType"> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </param>
-        /// <param name="queueName"> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </param>
-        /// <param name="topicName"> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="subscriptionName"> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ServiceBusActiveMessagesAvailableWithNoListenersEventData(string namespaceName, string requestUri, string entityType, string queueName, string topicName, string subscriptionName, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            NamespaceName = namespaceName;
-            RequestUri = requestUri;
-            EntityType = entityType;
-            QueueName = queueName;
-            TopicName = topicName;
-            SubscriptionName = subscriptionName;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The namespace name of the Microsoft.ServiceBus resource. </summary>
-        public string NamespaceName { get; }
-        /// <summary> The endpoint of the Microsoft.ServiceBus resource. </summary>
-        public string RequestUri { get; }
-        /// <summary> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </summary>
-        public string EntityType { get; }
-        /// <summary> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </summary>
-        public string QueueName { get; }
-        /// <summary> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </summary>
-        public string TopicName { get; }
-        /// <summary> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </summary>
-        public string SubscriptionName { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData.Serialization.cs
deleted file mode 100644
index 4db6bbbb3307..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData.Serialization.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData : IUtf8JsonSerializable, IJsonModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(NamespaceName))
-            {
-                writer.WritePropertyName("namespaceName"u8);
-                writer.WriteStringValue(NamespaceName);
-            }
-            if (Optional.IsDefined(RequestUri))
-            {
-                writer.WritePropertyName("requestUri"u8);
-                writer.WriteStringValue(RequestUri);
-            }
-            if (Optional.IsDefined(EntityType))
-            {
-                writer.WritePropertyName("entityType"u8);
-                writer.WriteStringValue(EntityType);
-            }
-            if (Optional.IsDefined(QueueName))
-            {
-                writer.WritePropertyName("queueName"u8);
-                writer.WriteStringValue(QueueName);
-            }
-            if (Optional.IsDefined(TopicName))
-            {
-                writer.WritePropertyName("topicName"u8);
-                writer.WriteStringValue(TopicName);
-            }
-            if (Optional.IsDefined(SubscriptionName))
-            {
-                writer.WritePropertyName("subscriptionName"u8);
-                writer.WriteStringValue(SubscriptionName);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData IJsonModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData(document.RootElement, options);
-        }
-
-        internal static ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData DeserializeServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string namespaceName = default;
-            string requestUri = default;
-            string entityType = default;
-            string queueName = default;
-            string topicName = default;
-            string subscriptionName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestUri"u8))
-                {
-                    requestUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("entityType"u8))
-                {
-                    entityType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueName"u8))
-                {
-                    queueName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("topicName"u8))
-                {
-                    topicName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionName"u8))
-                {
-                    subscriptionName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData(
-                namespaceName,
-                requestUri,
-                entityType,
-                queueName,
-                topicName,
-                subscriptionName,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData IPersistableModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData.cs
deleted file mode 100644
index dcbc6d7da593..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailablePeriodicNotifications event. </summary>
-    public partial class ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData"/>. </summary>
-        internal ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData"/>. </summary>
-        /// <param name="namespaceName"> The namespace name of the Microsoft.ServiceBus resource. </param>
-        /// <param name="requestUri"> The endpoint of the Microsoft.ServiceBus resource. </param>
-        /// <param name="entityType"> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </param>
-        /// <param name="queueName"> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </param>
-        /// <param name="topicName"> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="subscriptionName"> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData(string namespaceName, string requestUri, string entityType, string queueName, string topicName, string subscriptionName, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            NamespaceName = namespaceName;
-            RequestUri = requestUri;
-            EntityType = entityType;
-            QueueName = queueName;
-            TopicName = topicName;
-            SubscriptionName = subscriptionName;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The namespace name of the Microsoft.ServiceBus resource. </summary>
-        public string NamespaceName { get; }
-        /// <summary> The endpoint of the Microsoft.ServiceBus resource. </summary>
-        public string RequestUri { get; }
-        /// <summary> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </summary>
-        public string EntityType { get; }
-        /// <summary> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </summary>
-        public string QueueName { get; }
-        /// <summary> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </summary>
-        public string TopicName { get; }
-        /// <summary> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </summary>
-        public string SubscriptionName { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.Serialization.cs
deleted file mode 100644
index 53f8605d54c4..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.Serialization.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class ServiceBusDeadletterMessagesAvailableWithNoListenersEventData : IUtf8JsonSerializable, IJsonModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ServiceBusDeadletterMessagesAvailableWithNoListenersEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(NamespaceName))
-            {
-                writer.WritePropertyName("namespaceName"u8);
-                writer.WriteStringValue(NamespaceName);
-            }
-            if (Optional.IsDefined(RequestUri))
-            {
-                writer.WritePropertyName("requestUri"u8);
-                writer.WriteStringValue(RequestUri);
-            }
-            if (Optional.IsDefined(EntityType))
-            {
-                writer.WritePropertyName("entityType"u8);
-                writer.WriteStringValue(EntityType);
-            }
-            if (Optional.IsDefined(QueueName))
-            {
-                writer.WritePropertyName("queueName"u8);
-                writer.WriteStringValue(QueueName);
-            }
-            if (Optional.IsDefined(TopicName))
-            {
-                writer.WritePropertyName("topicName"u8);
-                writer.WriteStringValue(TopicName);
-            }
-            if (Optional.IsDefined(SubscriptionName))
-            {
-                writer.WritePropertyName("subscriptionName"u8);
-                writer.WriteStringValue(SubscriptionName);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ServiceBusDeadletterMessagesAvailableWithNoListenersEventData IJsonModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ServiceBusDeadletterMessagesAvailableWithNoListenersEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeServiceBusDeadletterMessagesAvailableWithNoListenersEventData(document.RootElement, options);
-        }
-
-        internal static ServiceBusDeadletterMessagesAvailableWithNoListenersEventData DeserializeServiceBusDeadletterMessagesAvailableWithNoListenersEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string namespaceName = default;
-            string requestUri = default;
-            string entityType = default;
-            string queueName = default;
-            string topicName = default;
-            string subscriptionName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("namespaceName"u8))
-                {
-                    namespaceName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestUri"u8))
-                {
-                    requestUri = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("entityType"u8))
-                {
-                    entityType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("queueName"u8))
-                {
-                    queueName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("topicName"u8))
-                {
-                    topicName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("subscriptionName"u8))
-                {
-                    subscriptionName = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ServiceBusDeadletterMessagesAvailableWithNoListenersEventData(
-                namespaceName,
-                requestUri,
-                entityType,
-                queueName,
-                topicName,
-                subscriptionName,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ServiceBusDeadletterMessagesAvailableWithNoListenersEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ServiceBusDeadletterMessagesAvailableWithNoListenersEventData IPersistableModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeServiceBusDeadletterMessagesAvailableWithNoListenersEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ServiceBusDeadletterMessagesAvailableWithNoListenersEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ServiceBusDeadletterMessagesAvailableWithNoListenersEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ServiceBusDeadletterMessagesAvailableWithNoListenersEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeServiceBusDeadletterMessagesAvailableWithNoListenersEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.cs
deleted file mode 100644
index ea92138d8a82..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListeners event. </summary>
-    public partial class ServiceBusDeadletterMessagesAvailableWithNoListenersEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="ServiceBusDeadletterMessagesAvailableWithNoListenersEventData"/>. </summary>
-        internal ServiceBusDeadletterMessagesAvailableWithNoListenersEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ServiceBusDeadletterMessagesAvailableWithNoListenersEventData"/>. </summary>
-        /// <param name="namespaceName"> The namespace name of the Microsoft.ServiceBus resource. </param>
-        /// <param name="requestUri"> The endpoint of the Microsoft.ServiceBus resource. </param>
-        /// <param name="entityType"> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </param>
-        /// <param name="queueName"> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </param>
-        /// <param name="topicName"> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="subscriptionName"> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ServiceBusDeadletterMessagesAvailableWithNoListenersEventData(string namespaceName, string requestUri, string entityType, string queueName, string topicName, string subscriptionName, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            NamespaceName = namespaceName;
-            RequestUri = requestUri;
-            EntityType = entityType;
-            QueueName = queueName;
-            TopicName = topicName;
-            SubscriptionName = subscriptionName;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The namespace name of the Microsoft.ServiceBus resource. </summary>
-        public string NamespaceName { get; }
-        /// <summary> The endpoint of the Microsoft.ServiceBus resource. </summary>
-        public string RequestUri { get; }
-        /// <summary> The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'. </summary>
-        public string EntityType { get; }
-        /// <summary> The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null. </summary>
-        public string QueueName { get; }
-        /// <summary> The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null. </summary>
-        public string TopicName { get; }
-        /// <summary> The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null. </summary>
-        public string SubscriptionName { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionConnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionConnectedEventData.Serialization.cs
deleted file mode 100644
index 13dd8294ddcd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionConnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class SignalRServiceClientConnectionConnectedEventData : IUtf8JsonSerializable, IJsonModel<SignalRServiceClientConnectionConnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SignalRServiceClientConnectionConnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SignalRServiceClientConnectionConnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SignalRServiceClientConnectionConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SignalRServiceClientConnectionConnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(HubName))
-            {
-                writer.WritePropertyName("hubName"u8);
-                writer.WriteStringValue(HubName);
-            }
-            if (Optional.IsDefined(ConnectionId))
-            {
-                writer.WritePropertyName("connectionId"u8);
-                writer.WriteStringValue(ConnectionId);
-            }
-            if (Optional.IsDefined(UserId))
-            {
-                writer.WritePropertyName("userId"u8);
-                writer.WriteStringValue(UserId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        SignalRServiceClientConnectionConnectedEventData IJsonModel<SignalRServiceClientConnectionConnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SignalRServiceClientConnectionConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SignalRServiceClientConnectionConnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSignalRServiceClientConnectionConnectedEventData(document.RootElement, options);
-        }
-
-        internal static SignalRServiceClientConnectionConnectedEventData DeserializeSignalRServiceClientConnectionConnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string hubName = default;
-            string connectionId = default;
-            string userId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("hubName"u8))
-                {
-                    hubName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("connectionId"u8))
-                {
-                    connectionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("userId"u8))
-                {
-                    userId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SignalRServiceClientConnectionConnectedEventData(timestamp, hubName, connectionId, userId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SignalRServiceClientConnectionConnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SignalRServiceClientConnectionConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(SignalRServiceClientConnectionConnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SignalRServiceClientConnectionConnectedEventData IPersistableModel<SignalRServiceClientConnectionConnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SignalRServiceClientConnectionConnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeSignalRServiceClientConnectionConnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SignalRServiceClientConnectionConnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SignalRServiceClientConnectionConnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static SignalRServiceClientConnectionConnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeSignalRServiceClientConnectionConnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionConnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionConnectedEventData.cs
deleted file mode 100644
index dcb093dd889d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionConnectedEventData.cs
+++ /dev/null
@@ -1,84 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.SignalRService.ClientConnectionConnected event. </summary>
-    public partial class SignalRServiceClientConnectionConnectedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SignalRServiceClientConnectionConnectedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        internal SignalRServiceClientConnectionConnectedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SignalRServiceClientConnectionConnectedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="hubName"> The hub of connected client connection. </param>
-        /// <param name="connectionId"> The connection Id of connected client connection. </param>
-        /// <param name="userId"> The user Id of connected client connection. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SignalRServiceClientConnectionConnectedEventData(DateTimeOffset timestamp, string hubName, string connectionId, string userId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            HubName = hubName;
-            ConnectionId = connectionId;
-            UserId = userId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SignalRServiceClientConnectionConnectedEventData"/> for deserialization. </summary>
-        internal SignalRServiceClientConnectionConnectedEventData()
-        {
-        }
-
-        /// <summary> The time at which the event occurred. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The hub of connected client connection. </summary>
-        public string HubName { get; }
-        /// <summary> The connection Id of connected client connection. </summary>
-        public string ConnectionId { get; }
-        /// <summary> The user Id of connected client connection. </summary>
-        public string UserId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionDisconnectedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionDisconnectedEventData.Serialization.cs
deleted file mode 100644
index 33279e9b4fe6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionDisconnectedEventData.Serialization.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class SignalRServiceClientConnectionDisconnectedEventData : IUtf8JsonSerializable, IJsonModel<SignalRServiceClientConnectionDisconnectedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SignalRServiceClientConnectionDisconnectedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SignalRServiceClientConnectionDisconnectedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SignalRServiceClientConnectionDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SignalRServiceClientConnectionDisconnectedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("timestamp"u8);
-            writer.WriteStringValue(Timestamp, "O");
-            if (Optional.IsDefined(HubName))
-            {
-                writer.WritePropertyName("hubName"u8);
-                writer.WriteStringValue(HubName);
-            }
-            if (Optional.IsDefined(ConnectionId))
-            {
-                writer.WritePropertyName("connectionId"u8);
-                writer.WriteStringValue(ConnectionId);
-            }
-            if (Optional.IsDefined(UserId))
-            {
-                writer.WritePropertyName("userId"u8);
-                writer.WriteStringValue(UserId);
-            }
-            if (Optional.IsDefined(ErrorMessage))
-            {
-                writer.WritePropertyName("errorMessage"u8);
-                writer.WriteStringValue(ErrorMessage);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        SignalRServiceClientConnectionDisconnectedEventData IJsonModel<SignalRServiceClientConnectionDisconnectedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SignalRServiceClientConnectionDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SignalRServiceClientConnectionDisconnectedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSignalRServiceClientConnectionDisconnectedEventData(document.RootElement, options);
-        }
-
-        internal static SignalRServiceClientConnectionDisconnectedEventData DeserializeSignalRServiceClientConnectionDisconnectedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset timestamp = default;
-            string hubName = default;
-            string connectionId = default;
-            string userId = default;
-            string errorMessage = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("timestamp"u8))
-                {
-                    timestamp = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("hubName"u8))
-                {
-                    hubName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("connectionId"u8))
-                {
-                    connectionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("userId"u8))
-                {
-                    userId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("errorMessage"u8))
-                {
-                    errorMessage = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SignalRServiceClientConnectionDisconnectedEventData(
-                timestamp,
-                hubName,
-                connectionId,
-                userId,
-                errorMessage,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SignalRServiceClientConnectionDisconnectedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SignalRServiceClientConnectionDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(SignalRServiceClientConnectionDisconnectedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SignalRServiceClientConnectionDisconnectedEventData IPersistableModel<SignalRServiceClientConnectionDisconnectedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SignalRServiceClientConnectionDisconnectedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeSignalRServiceClientConnectionDisconnectedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SignalRServiceClientConnectionDisconnectedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SignalRServiceClientConnectionDisconnectedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static SignalRServiceClientConnectionDisconnectedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeSignalRServiceClientConnectionDisconnectedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionDisconnectedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionDisconnectedEventData.cs
deleted file mode 100644
index 6a0f3883fc81..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SignalRServiceClientConnectionDisconnectedEventData.cs
+++ /dev/null
@@ -1,88 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.SignalRService.ClientConnectionDisconnected event. </summary>
-    public partial class SignalRServiceClientConnectionDisconnectedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SignalRServiceClientConnectionDisconnectedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        internal SignalRServiceClientConnectionDisconnectedEventData(DateTimeOffset timestamp)
-        {
-            Timestamp = timestamp;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SignalRServiceClientConnectionDisconnectedEventData"/>. </summary>
-        /// <param name="timestamp"> The time at which the event occurred. </param>
-        /// <param name="hubName"> The hub of connected client connection. </param>
-        /// <param name="connectionId"> The connection Id of connected client connection. </param>
-        /// <param name="userId"> The user Id of connected client connection. </param>
-        /// <param name="errorMessage"> The message of error that cause the client connection disconnected. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SignalRServiceClientConnectionDisconnectedEventData(DateTimeOffset timestamp, string hubName, string connectionId, string userId, string errorMessage, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Timestamp = timestamp;
-            HubName = hubName;
-            ConnectionId = connectionId;
-            UserId = userId;
-            ErrorMessage = errorMessage;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SignalRServiceClientConnectionDisconnectedEventData"/> for deserialization. </summary>
-        internal SignalRServiceClientConnectionDisconnectedEventData()
-        {
-        }
-
-        /// <summary> The time at which the event occurred. </summary>
-        public DateTimeOffset Timestamp { get; }
-        /// <summary> The hub of connected client connection. </summary>
-        public string HubName { get; }
-        /// <summary> The connection Id of connected client connection. </summary>
-        public string ConnectionId { get; }
-        /// <summary> The user Id of connected client connection. </summary>
-        public string UserId { get; }
-        /// <summary> The message of error that cause the client connection disconnected. </summary>
-        public string ErrorMessage { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StampKind.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StampKind.cs
deleted file mode 100644
index e80161dd3493..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StampKind.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Kind of environment where app service plan is. </summary>
-    public readonly partial struct StampKind : IEquatable<StampKind>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="StampKind"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public StampKind(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string PublicValue = "Public";
-        private const string AseV1Value = "AseV1";
-        private const string AseV2Value = "AseV2";
-
-        /// <summary> App Service Plan is running on a public stamp. </summary>
-        public static StampKind Public { get; } = new StampKind(PublicValue);
-        /// <summary> App Service Plan is running on an App Service Environment V1. </summary>
-        public static StampKind AseV1 { get; } = new StampKind(AseV1Value);
-        /// <summary> App Service Plan is running on an App Service Environment V2. </summary>
-        public static StampKind AseV2 { get; } = new StampKind(AseV2Value);
-        /// <summary> Determines if two <see cref="StampKind"/> values are the same. </summary>
-        public static bool operator ==(StampKind left, StampKind right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="StampKind"/> values are not the same. </summary>
-        public static bool operator !=(StampKind left, StampKind right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="StampKind"/>. </summary>
-        public static implicit operator StampKind(string value) => new StampKind(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is StampKind other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(StampKind other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageAsyncOperationInitiatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageAsyncOperationInitiatedEventData.Serialization.cs
deleted file mode 100644
index c70924f23f12..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageAsyncOperationInitiatedEventData.Serialization.cs
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageAsyncOperationInitiatedEventData : IUtf8JsonSerializable, IJsonModel<StorageAsyncOperationInitiatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageAsyncOperationInitiatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageAsyncOperationInitiatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageAsyncOperationInitiatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageAsyncOperationInitiatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Api))
-            {
-                writer.WritePropertyName("api"u8);
-                writer.WriteStringValue(Api);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(ContentType))
-            {
-                writer.WritePropertyName("contentType"u8);
-                writer.WriteStringValue(ContentType);
-            }
-            if (Optional.IsDefined(ContentLength))
-            {
-                writer.WritePropertyName("contentLength"u8);
-                writer.WriteNumberValue(ContentLength.Value);
-            }
-            if (Optional.IsDefined(BlobType))
-            {
-                writer.WritePropertyName("blobType"u8);
-                writer.WriteStringValue(BlobType);
-            }
-            if (Optional.IsDefined(Url))
-            {
-                writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Url);
-            }
-            if (Optional.IsDefined(Sequencer))
-            {
-                writer.WritePropertyName("sequencer"u8);
-                writer.WriteStringValue(Sequencer);
-            }
-            if (Optional.IsDefined(Identity))
-            {
-                writer.WritePropertyName("identity"u8);
-                writer.WriteStringValue(Identity);
-            }
-            writer.WritePropertyName("storageDiagnostics"u8);
-            writer.WriteStartObject();
-            foreach (var item in StorageDiagnostics)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageAsyncOperationInitiatedEventData IJsonModel<StorageAsyncOperationInitiatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageAsyncOperationInitiatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageAsyncOperationInitiatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageAsyncOperationInitiatedEventData(document.RootElement, options);
-        }
-
-        internal static StorageAsyncOperationInitiatedEventData DeserializeStorageAsyncOperationInitiatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string api = default;
-            string clientRequestId = default;
-            string requestId = default;
-            string contentType = default;
-            long? contentLength = default;
-            string blobType = default;
-            string url = default;
-            string sequencer = default;
-            string identity = default;
-            IReadOnlyDictionary<string, BinaryData> storageDiagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("api"u8))
-                {
-                    api = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("contentType"u8))
-                {
-                    contentType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("contentLength"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    contentLength = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("blobType"u8))
-                {
-                    blobType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("url"u8))
-                {
-                    url = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequencer"u8))
-                {
-                    sequencer = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("identity"u8))
-                {
-                    identity = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("storageDiagnostics"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    storageDiagnostics = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageAsyncOperationInitiatedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                contentType,
-                contentLength,
-                blobType,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageAsyncOperationInitiatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageAsyncOperationInitiatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageAsyncOperationInitiatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageAsyncOperationInitiatedEventData IPersistableModel<StorageAsyncOperationInitiatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageAsyncOperationInitiatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageAsyncOperationInitiatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageAsyncOperationInitiatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageAsyncOperationInitiatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageAsyncOperationInitiatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageAsyncOperationInitiatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageAsyncOperationInitiatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageAsyncOperationInitiatedEventData.cs
deleted file mode 100644
index 18206f1e5c1f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageAsyncOperationInitiatedEventData.cs
+++ /dev/null
@@ -1,140 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.AsyncOperationInitiated event. </summary>
-    public partial class StorageAsyncOperationInitiatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageAsyncOperationInitiatedEventData"/>. </summary>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="storageDiagnostics"/> is null. </exception>
-        internal StorageAsyncOperationInitiatedEventData(IReadOnlyDictionary<string, BinaryData> storageDiagnostics)
-        {
-            Argument.AssertNotNull(storageDiagnostics, nameof(storageDiagnostics));
-
-            StorageDiagnostics = storageDiagnostics;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageAsyncOperationInitiatedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="contentType"> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </param>
-        /// <param name="contentLength"> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </param>
-        /// <param name="blobType"> The type of blob. </param>
-        /// <param name="url"> The path to the blob. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageAsyncOperationInitiatedEventData(string api, string clientRequestId, string requestId, string contentType, long? contentLength, string blobType, string url, string sequencer, string identity, IReadOnlyDictionary<string, BinaryData> storageDiagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Api = api;
-            ClientRequestId = clientRequestId;
-            RequestId = requestId;
-            ContentType = contentType;
-            ContentLength = contentLength;
-            BlobType = blobType;
-            Url = url;
-            Sequencer = sequencer;
-            Identity = identity;
-            StorageDiagnostics = storageDiagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageAsyncOperationInitiatedEventData"/> for deserialization. </summary>
-        internal StorageAsyncOperationInitiatedEventData()
-        {
-        }
-
-        /// <summary> The name of the API/operation that triggered this event. </summary>
-        public string Api { get; }
-        /// <summary> A request id provided by the client of the storage API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The request id generated by the storage service for the storage API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </summary>
-        public string ContentType { get; }
-        /// <summary> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </summary>
-        public long? ContentLength { get; }
-        /// <summary> The type of blob. </summary>
-        public string BlobType { get; }
-        /// <summary> The path to the blob. </summary>
-        public string Url { get; }
-        /// <summary> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </summary>
-        public string Sequencer { get; }
-        /// <summary> The identity of the requester that triggered this event. </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> StorageDiagnostics { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobCreatedEventData.Serialization.cs
deleted file mode 100644
index 2612495b4542..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageBlobCreatedEventData : IUtf8JsonSerializable, IJsonModel<StorageBlobCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageBlobCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageBlobCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Api))
-            {
-                writer.WritePropertyName("api"u8);
-                writer.WriteStringValue(Api);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(ETag))
-            {
-                writer.WritePropertyName("eTag"u8);
-                writer.WriteStringValue(ETag);
-            }
-            if (Optional.IsDefined(ContentType))
-            {
-                writer.WritePropertyName("contentType"u8);
-                writer.WriteStringValue(ContentType);
-            }
-            if (Optional.IsDefined(ContentLength))
-            {
-                writer.WritePropertyName("contentLength"u8);
-                writer.WriteNumberValue(ContentLength.Value);
-            }
-            if (Optional.IsDefined(ContentOffset))
-            {
-                writer.WritePropertyName("contentOffset"u8);
-                writer.WriteNumberValue(ContentOffset.Value);
-            }
-            if (Optional.IsDefined(BlobType))
-            {
-                writer.WritePropertyName("blobType"u8);
-                writer.WriteStringValue(BlobType);
-            }
-            if (Optional.IsDefined(Url))
-            {
-                writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Url);
-            }
-            if (Optional.IsDefined(Sequencer))
-            {
-                writer.WritePropertyName("sequencer"u8);
-                writer.WriteStringValue(Sequencer);
-            }
-            if (Optional.IsDefined(Identity))
-            {
-                writer.WritePropertyName("identity"u8);
-                writer.WriteStringValue(Identity);
-            }
-            writer.WritePropertyName("storageDiagnostics"u8);
-            writer.WriteStartObject();
-            foreach (var item in StorageDiagnostics)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageBlobCreatedEventData IJsonModel<StorageBlobCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageBlobCreatedEventData(document.RootElement, options);
-        }
-
-        internal static StorageBlobCreatedEventData DeserializeStorageBlobCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string api = default;
-            string clientRequestId = default;
-            string requestId = default;
-            string eTag = default;
-            string contentType = default;
-            long? contentLength = default;
-            long? contentOffset = default;
-            string blobType = default;
-            string url = default;
-            string sequencer = default;
-            string identity = default;
-            IReadOnlyDictionary<string, BinaryData> storageDiagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("api"u8))
-                {
-                    api = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("eTag"u8))
-                {
-                    eTag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("contentType"u8))
-                {
-                    contentType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("contentLength"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    contentLength = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("contentOffset"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    contentOffset = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("blobType"u8))
-                {
-                    blobType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("url"u8))
-                {
-                    url = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequencer"u8))
-                {
-                    sequencer = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("identity"u8))
-                {
-                    identity = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("storageDiagnostics"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    storageDiagnostics = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageBlobCreatedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                eTag,
-                contentType,
-                contentLength,
-                contentOffset,
-                blobType,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageBlobCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageBlobCreatedEventData IPersistableModel<StorageBlobCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageBlobCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageBlobCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageBlobCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageBlobCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobCreatedEventData.cs
deleted file mode 100644
index a1799eea345a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobCreatedEventData.cs
+++ /dev/null
@@ -1,148 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.BlobCreated event. </summary>
-    public partial class StorageBlobCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobCreatedEventData"/>. </summary>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="storageDiagnostics"/> is null. </exception>
-        internal StorageBlobCreatedEventData(IReadOnlyDictionary<string, BinaryData> storageDiagnostics)
-        {
-            Argument.AssertNotNull(storageDiagnostics, nameof(storageDiagnostics));
-
-            StorageDiagnostics = storageDiagnostics;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobCreatedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="eTag"> The etag of the blob at the time this event was triggered. </param>
-        /// <param name="contentType"> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </param>
-        /// <param name="contentLength"> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </param>
-        /// <param name="contentOffset"> The offset of the blob in bytes. </param>
-        /// <param name="blobType"> The type of blob. </param>
-        /// <param name="url"> The path to the blob. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageBlobCreatedEventData(string api, string clientRequestId, string requestId, string eTag, string contentType, long? contentLength, long? contentOffset, string blobType, string url, string sequencer, string identity, IReadOnlyDictionary<string, BinaryData> storageDiagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Api = api;
-            ClientRequestId = clientRequestId;
-            RequestId = requestId;
-            ETag = eTag;
-            ContentType = contentType;
-            ContentLength = contentLength;
-            ContentOffset = contentOffset;
-            BlobType = blobType;
-            Url = url;
-            Sequencer = sequencer;
-            Identity = identity;
-            StorageDiagnostics = storageDiagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobCreatedEventData"/> for deserialization. </summary>
-        internal StorageBlobCreatedEventData()
-        {
-        }
-
-        /// <summary> The name of the API/operation that triggered this event. </summary>
-        public string Api { get; }
-        /// <summary> A request id provided by the client of the storage API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The request id generated by the storage service for the storage API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> The etag of the blob at the time this event was triggered. </summary>
-        public string ETag { get; }
-        /// <summary> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </summary>
-        public string ContentType { get; }
-        /// <summary> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </summary>
-        public long? ContentLength { get; }
-        /// <summary> The offset of the blob in bytes. </summary>
-        public long? ContentOffset { get; }
-        /// <summary> The type of blob. </summary>
-        public string BlobType { get; }
-        /// <summary> The path to the blob. </summary>
-        public string Url { get; }
-        /// <summary> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </summary>
-        public string Sequencer { get; }
-        /// <summary> The identity of the requester that triggered this event. </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> StorageDiagnostics { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobDeletedEventData.Serialization.cs
deleted file mode 100644
index f9d3b771d7a9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageBlobDeletedEventData : IUtf8JsonSerializable, IJsonModel<StorageBlobDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageBlobDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageBlobDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Api))
-            {
-                writer.WritePropertyName("api"u8);
-                writer.WriteStringValue(Api);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(ContentType))
-            {
-                writer.WritePropertyName("contentType"u8);
-                writer.WriteStringValue(ContentType);
-            }
-            if (Optional.IsDefined(BlobType))
-            {
-                writer.WritePropertyName("blobType"u8);
-                writer.WriteStringValue(BlobType);
-            }
-            if (Optional.IsDefined(Url))
-            {
-                writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Url);
-            }
-            if (Optional.IsDefined(Sequencer))
-            {
-                writer.WritePropertyName("sequencer"u8);
-                writer.WriteStringValue(Sequencer);
-            }
-            if (Optional.IsDefined(Identity))
-            {
-                writer.WritePropertyName("identity"u8);
-                writer.WriteStringValue(Identity);
-            }
-            writer.WritePropertyName("storageDiagnostics"u8);
-            writer.WriteStartObject();
-            foreach (var item in StorageDiagnostics)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageBlobDeletedEventData IJsonModel<StorageBlobDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageBlobDeletedEventData(document.RootElement, options);
-        }
-
-        internal static StorageBlobDeletedEventData DeserializeStorageBlobDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string api = default;
-            string clientRequestId = default;
-            string requestId = default;
-            string contentType = default;
-            string blobType = default;
-            string url = default;
-            string sequencer = default;
-            string identity = default;
-            IReadOnlyDictionary<string, BinaryData> storageDiagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("api"u8))
-                {
-                    api = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("contentType"u8))
-                {
-                    contentType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("blobType"u8))
-                {
-                    blobType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("url"u8))
-                {
-                    url = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequencer"u8))
-                {
-                    sequencer = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("identity"u8))
-                {
-                    identity = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("storageDiagnostics"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    storageDiagnostics = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageBlobDeletedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                contentType,
-                blobType,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageBlobDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageBlobDeletedEventData IPersistableModel<StorageBlobDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageBlobDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageBlobDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageBlobDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageBlobDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobDeletedEventData.cs
deleted file mode 100644
index c819b253bf34..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobDeletedEventData.cs
+++ /dev/null
@@ -1,136 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.BlobDeleted event. </summary>
-    public partial class StorageBlobDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobDeletedEventData"/>. </summary>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="storageDiagnostics"/> is null. </exception>
-        internal StorageBlobDeletedEventData(IReadOnlyDictionary<string, BinaryData> storageDiagnostics)
-        {
-            Argument.AssertNotNull(storageDiagnostics, nameof(storageDiagnostics));
-
-            StorageDiagnostics = storageDiagnostics;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobDeletedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="contentType"> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </param>
-        /// <param name="blobType"> The type of blob. </param>
-        /// <param name="url"> The path to the blob. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageBlobDeletedEventData(string api, string clientRequestId, string requestId, string contentType, string blobType, string url, string sequencer, string identity, IReadOnlyDictionary<string, BinaryData> storageDiagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Api = api;
-            ClientRequestId = clientRequestId;
-            RequestId = requestId;
-            ContentType = contentType;
-            BlobType = blobType;
-            Url = url;
-            Sequencer = sequencer;
-            Identity = identity;
-            StorageDiagnostics = storageDiagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobDeletedEventData"/> for deserialization. </summary>
-        internal StorageBlobDeletedEventData()
-        {
-        }
-
-        /// <summary> The name of the API/operation that triggered this event. </summary>
-        public string Api { get; }
-        /// <summary> A request id provided by the client of the storage API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The request id generated by the storage service for the storage API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </summary>
-        public string ContentType { get; }
-        /// <summary> The type of blob. </summary>
-        public string BlobType { get; }
-        /// <summary> The path to the blob. </summary>
-        public string Url { get; }
-        /// <summary> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </summary>
-        public string Sequencer { get; }
-        /// <summary> The identity of the requester that triggered this event. </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> StorageDiagnostics { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobInventoryPolicyCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobInventoryPolicyCompletedEventData.Serialization.cs
deleted file mode 100644
index 6471e17fc66b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobInventoryPolicyCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageBlobInventoryPolicyCompletedEventData : IUtf8JsonSerializable, IJsonModel<StorageBlobInventoryPolicyCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageBlobInventoryPolicyCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageBlobInventoryPolicyCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobInventoryPolicyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobInventoryPolicyCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("scheduleDateTime"u8);
-            writer.WriteStringValue(ScheduleDateTime, "O");
-            if (Optional.IsDefined(AccountName))
-            {
-                writer.WritePropertyName("accountName"u8);
-                writer.WriteStringValue(AccountName);
-            }
-            if (Optional.IsDefined(RuleName))
-            {
-                writer.WritePropertyName("ruleName"u8);
-                writer.WriteStringValue(RuleName);
-            }
-            if (Optional.IsDefined(PolicyRunStatus))
-            {
-                writer.WritePropertyName("policyRunStatus"u8);
-                writer.WriteStringValue(PolicyRunStatus);
-            }
-            if (Optional.IsDefined(PolicyRunStatusMessage))
-            {
-                writer.WritePropertyName("policyRunStatusMessage"u8);
-                writer.WriteStringValue(PolicyRunStatusMessage);
-            }
-            if (Optional.IsDefined(PolicyRunId))
-            {
-                writer.WritePropertyName("policyRunId"u8);
-                writer.WriteStringValue(PolicyRunId);
-            }
-            if (Optional.IsDefined(ManifestBlobUrl))
-            {
-                writer.WritePropertyName("manifestBlobUrl"u8);
-                writer.WriteStringValue(ManifestBlobUrl);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageBlobInventoryPolicyCompletedEventData IJsonModel<StorageBlobInventoryPolicyCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobInventoryPolicyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobInventoryPolicyCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageBlobInventoryPolicyCompletedEventData(document.RootElement, options);
-        }
-
-        internal static StorageBlobInventoryPolicyCompletedEventData DeserializeStorageBlobInventoryPolicyCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset scheduleDateTime = default;
-            string accountName = default;
-            string ruleName = default;
-            string policyRunStatus = default;
-            string policyRunStatusMessage = default;
-            string policyRunId = default;
-            string manifestBlobUrl = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("scheduleDateTime"u8))
-                {
-                    scheduleDateTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("accountName"u8))
-                {
-                    accountName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("ruleName"u8))
-                {
-                    ruleName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyRunStatus"u8))
-                {
-                    policyRunStatus = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyRunStatusMessage"u8))
-                {
-                    policyRunStatusMessage = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("policyRunId"u8))
-                {
-                    policyRunId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("manifestBlobUrl"u8))
-                {
-                    manifestBlobUrl = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageBlobInventoryPolicyCompletedEventData(
-                scheduleDateTime,
-                accountName,
-                ruleName,
-                policyRunStatus,
-                policyRunStatusMessage,
-                policyRunId,
-                manifestBlobUrl,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageBlobInventoryPolicyCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobInventoryPolicyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobInventoryPolicyCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageBlobInventoryPolicyCompletedEventData IPersistableModel<StorageBlobInventoryPolicyCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobInventoryPolicyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageBlobInventoryPolicyCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobInventoryPolicyCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageBlobInventoryPolicyCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageBlobInventoryPolicyCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageBlobInventoryPolicyCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobInventoryPolicyCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobInventoryPolicyCompletedEventData.cs
deleted file mode 100644
index 97097e7a9b6f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobInventoryPolicyCompletedEventData.cs
+++ /dev/null
@@ -1,96 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for an Microsoft.Storage.BlobInventoryPolicyCompleted event. </summary>
-    public partial class StorageBlobInventoryPolicyCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobInventoryPolicyCompletedEventData"/>. </summary>
-        /// <param name="scheduleDateTime"> The time at which inventory policy was scheduled. </param>
-        internal StorageBlobInventoryPolicyCompletedEventData(DateTimeOffset scheduleDateTime)
-        {
-            ScheduleDateTime = scheduleDateTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobInventoryPolicyCompletedEventData"/>. </summary>
-        /// <param name="scheduleDateTime"> The time at which inventory policy was scheduled. </param>
-        /// <param name="accountName"> The account name for which inventory policy is registered. </param>
-        /// <param name="ruleName"> The rule name for inventory policy. </param>
-        /// <param name="policyRunStatus"> The status of inventory run, it can be Succeeded/PartiallySucceeded/Failed. </param>
-        /// <param name="policyRunStatusMessage"> The status message for inventory run. </param>
-        /// <param name="policyRunId"> The policy run id for inventory run. </param>
-        /// <param name="manifestBlobUrl"> The blob URL for manifest file for inventory run. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageBlobInventoryPolicyCompletedEventData(DateTimeOffset scheduleDateTime, string accountName, string ruleName, string policyRunStatus, string policyRunStatusMessage, string policyRunId, string manifestBlobUrl, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ScheduleDateTime = scheduleDateTime;
-            AccountName = accountName;
-            RuleName = ruleName;
-            PolicyRunStatus = policyRunStatus;
-            PolicyRunStatusMessage = policyRunStatusMessage;
-            PolicyRunId = policyRunId;
-            ManifestBlobUrl = manifestBlobUrl;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobInventoryPolicyCompletedEventData"/> for deserialization. </summary>
-        internal StorageBlobInventoryPolicyCompletedEventData()
-        {
-        }
-
-        /// <summary> The time at which inventory policy was scheduled. </summary>
-        public DateTimeOffset ScheduleDateTime { get; }
-        /// <summary> The account name for which inventory policy is registered. </summary>
-        public string AccountName { get; }
-        /// <summary> The rule name for inventory policy. </summary>
-        public string RuleName { get; }
-        /// <summary> The status of inventory run, it can be Succeeded/PartiallySucceeded/Failed. </summary>
-        public string PolicyRunStatus { get; }
-        /// <summary> The status message for inventory run. </summary>
-        public string PolicyRunStatusMessage { get; }
-        /// <summary> The policy run id for inventory run. </summary>
-        public string PolicyRunId { get; }
-        /// <summary> The blob URL for manifest file for inventory run. </summary>
-        public string ManifestBlobUrl { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobRenamedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobRenamedEventData.Serialization.cs
deleted file mode 100644
index 0cef85c3fe60..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobRenamedEventData.Serialization.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageBlobRenamedEventData : IUtf8JsonSerializable, IJsonModel<StorageBlobRenamedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageBlobRenamedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageBlobRenamedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobRenamedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobRenamedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Api))
-            {
-                writer.WritePropertyName("api"u8);
-                writer.WriteStringValue(Api);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(SourceUrl))
-            {
-                writer.WritePropertyName("sourceUrl"u8);
-                writer.WriteStringValue(SourceUrl);
-            }
-            if (Optional.IsDefined(DestinationUrl))
-            {
-                writer.WritePropertyName("destinationUrl"u8);
-                writer.WriteStringValue(DestinationUrl);
-            }
-            if (Optional.IsDefined(Sequencer))
-            {
-                writer.WritePropertyName("sequencer"u8);
-                writer.WriteStringValue(Sequencer);
-            }
-            if (Optional.IsDefined(Identity))
-            {
-                writer.WritePropertyName("identity"u8);
-                writer.WriteStringValue(Identity);
-            }
-            writer.WritePropertyName("storageDiagnostics"u8);
-            writer.WriteStartObject();
-            foreach (var item in StorageDiagnostics)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageBlobRenamedEventData IJsonModel<StorageBlobRenamedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobRenamedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobRenamedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageBlobRenamedEventData(document.RootElement, options);
-        }
-
-        internal static StorageBlobRenamedEventData DeserializeStorageBlobRenamedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string api = default;
-            string clientRequestId = default;
-            string requestId = default;
-            string sourceUrl = default;
-            string destinationUrl = default;
-            string sequencer = default;
-            string identity = default;
-            IReadOnlyDictionary<string, BinaryData> storageDiagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("api"u8))
-                {
-                    api = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sourceUrl"u8))
-                {
-                    sourceUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("destinationUrl"u8))
-                {
-                    destinationUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequencer"u8))
-                {
-                    sequencer = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("identity"u8))
-                {
-                    identity = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("storageDiagnostics"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    storageDiagnostics = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageBlobRenamedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                sourceUrl,
-                destinationUrl,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageBlobRenamedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobRenamedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobRenamedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageBlobRenamedEventData IPersistableModel<StorageBlobRenamedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobRenamedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageBlobRenamedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobRenamedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageBlobRenamedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageBlobRenamedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageBlobRenamedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobRenamedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobRenamedEventData.cs
deleted file mode 100644
index 04cb73986c2e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobRenamedEventData.cs
+++ /dev/null
@@ -1,132 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.BlobRenamed event. </summary>
-    public partial class StorageBlobRenamedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobRenamedEventData"/>. </summary>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="storageDiagnostics"/> is null. </exception>
-        internal StorageBlobRenamedEventData(IReadOnlyDictionary<string, BinaryData> storageDiagnostics)
-        {
-            Argument.AssertNotNull(storageDiagnostics, nameof(storageDiagnostics));
-
-            StorageDiagnostics = storageDiagnostics;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobRenamedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="sourceUrl"> The path to the blob that was renamed. </param>
-        /// <param name="destinationUrl"> The new path to the blob after the rename operation. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageBlobRenamedEventData(string api, string clientRequestId, string requestId, string sourceUrl, string destinationUrl, string sequencer, string identity, IReadOnlyDictionary<string, BinaryData> storageDiagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Api = api;
-            ClientRequestId = clientRequestId;
-            RequestId = requestId;
-            SourceUrl = sourceUrl;
-            DestinationUrl = destinationUrl;
-            Sequencer = sequencer;
-            Identity = identity;
-            StorageDiagnostics = storageDiagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobRenamedEventData"/> for deserialization. </summary>
-        internal StorageBlobRenamedEventData()
-        {
-        }
-
-        /// <summary> The name of the API/operation that triggered this event. </summary>
-        public string Api { get; }
-        /// <summary> A request id provided by the client of the storage API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The request id generated by the storage service for the storage API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> The path to the blob that was renamed. </summary>
-        public string SourceUrl { get; }
-        /// <summary> The new path to the blob after the rename operation. </summary>
-        public string DestinationUrl { get; }
-        /// <summary> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </summary>
-        public string Sequencer { get; }
-        /// <summary> The identity of the requester that triggered this event. </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> StorageDiagnostics { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobTierChangedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobTierChangedEventData.Serialization.cs
deleted file mode 100644
index 7ecdd6aae802..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobTierChangedEventData.Serialization.cs
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageBlobTierChangedEventData : IUtf8JsonSerializable, IJsonModel<StorageBlobTierChangedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageBlobTierChangedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageBlobTierChangedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobTierChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobTierChangedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Api))
-            {
-                writer.WritePropertyName("api"u8);
-                writer.WriteStringValue(Api);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(ContentType))
-            {
-                writer.WritePropertyName("contentType"u8);
-                writer.WriteStringValue(ContentType);
-            }
-            if (Optional.IsDefined(ContentLength))
-            {
-                writer.WritePropertyName("contentLength"u8);
-                writer.WriteNumberValue(ContentLength.Value);
-            }
-            if (Optional.IsDefined(BlobType))
-            {
-                writer.WritePropertyName("blobType"u8);
-                writer.WriteStringValue(BlobType);
-            }
-            if (Optional.IsDefined(Url))
-            {
-                writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Url);
-            }
-            if (Optional.IsDefined(Sequencer))
-            {
-                writer.WritePropertyName("sequencer"u8);
-                writer.WriteStringValue(Sequencer);
-            }
-            if (Optional.IsDefined(Identity))
-            {
-                writer.WritePropertyName("identity"u8);
-                writer.WriteStringValue(Identity);
-            }
-            writer.WritePropertyName("storageDiagnostics"u8);
-            writer.WriteStartObject();
-            foreach (var item in StorageDiagnostics)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageBlobTierChangedEventData IJsonModel<StorageBlobTierChangedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobTierChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageBlobTierChangedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageBlobTierChangedEventData(document.RootElement, options);
-        }
-
-        internal static StorageBlobTierChangedEventData DeserializeStorageBlobTierChangedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string api = default;
-            string clientRequestId = default;
-            string requestId = default;
-            string contentType = default;
-            long? contentLength = default;
-            string blobType = default;
-            string url = default;
-            string sequencer = default;
-            string identity = default;
-            IReadOnlyDictionary<string, BinaryData> storageDiagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("api"u8))
-                {
-                    api = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("contentType"u8))
-                {
-                    contentType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("contentLength"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    contentLength = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("blobType"u8))
-                {
-                    blobType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("url"u8))
-                {
-                    url = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequencer"u8))
-                {
-                    sequencer = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("identity"u8))
-                {
-                    identity = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("storageDiagnostics"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    storageDiagnostics = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageBlobTierChangedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                contentType,
-                contentLength,
-                blobType,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageBlobTierChangedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobTierChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobTierChangedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageBlobTierChangedEventData IPersistableModel<StorageBlobTierChangedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageBlobTierChangedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageBlobTierChangedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageBlobTierChangedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageBlobTierChangedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageBlobTierChangedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageBlobTierChangedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobTierChangedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobTierChangedEventData.cs
deleted file mode 100644
index e1f0f18db416..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageBlobTierChangedEventData.cs
+++ /dev/null
@@ -1,140 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.BlobTierChanged event. </summary>
-    public partial class StorageBlobTierChangedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobTierChangedEventData"/>. </summary>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="storageDiagnostics"/> is null. </exception>
-        internal StorageBlobTierChangedEventData(IReadOnlyDictionary<string, BinaryData> storageDiagnostics)
-        {
-            Argument.AssertNotNull(storageDiagnostics, nameof(storageDiagnostics));
-
-            StorageDiagnostics = storageDiagnostics;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobTierChangedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="contentType"> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </param>
-        /// <param name="contentLength"> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </param>
-        /// <param name="blobType"> The type of blob. </param>
-        /// <param name="url"> The path to the blob. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageBlobTierChangedEventData(string api, string clientRequestId, string requestId, string contentType, long? contentLength, string blobType, string url, string sequencer, string identity, IReadOnlyDictionary<string, BinaryData> storageDiagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Api = api;
-            ClientRequestId = clientRequestId;
-            RequestId = requestId;
-            ContentType = contentType;
-            ContentLength = contentLength;
-            BlobType = blobType;
-            Url = url;
-            Sequencer = sequencer;
-            Identity = identity;
-            StorageDiagnostics = storageDiagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageBlobTierChangedEventData"/> for deserialization. </summary>
-        internal StorageBlobTierChangedEventData()
-        {
-        }
-
-        /// <summary> The name of the API/operation that triggered this event. </summary>
-        public string Api { get; }
-        /// <summary> A request id provided by the client of the storage API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The request id generated by the storage service for the storage API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> The content type of the blob. This is the same as what would be returned in the Content-Type header from the blob. </summary>
-        public string ContentType { get; }
-        /// <summary> The size of the blob in bytes. This is the same as what would be returned in the Content-Length header from the blob. </summary>
-        public long? ContentLength { get; }
-        /// <summary> The type of blob. </summary>
-        public string BlobType { get; }
-        /// <summary> The path to the blob. </summary>
-        public string Url { get; }
-        /// <summary> An opaque string value representing the logical sequence of events for any particular blob name. Users can use standard string comparison to understand the relative sequence of two events on the same blob name. </summary>
-        public string Sequencer { get; }
-        /// <summary> The identity of the requester that triggered this event. </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> StorageDiagnostics { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryCreatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryCreatedEventData.Serialization.cs
deleted file mode 100644
index 0d0d24c1033c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryCreatedEventData.Serialization.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageDirectoryCreatedEventData : IUtf8JsonSerializable, IJsonModel<StorageDirectoryCreatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageDirectoryCreatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageDirectoryCreatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageDirectoryCreatedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Api))
-            {
-                writer.WritePropertyName("api"u8);
-                writer.WriteStringValue(Api);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(ETag))
-            {
-                writer.WritePropertyName("eTag"u8);
-                writer.WriteStringValue(ETag);
-            }
-            if (Optional.IsDefined(Url))
-            {
-                writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Url);
-            }
-            if (Optional.IsDefined(Sequencer))
-            {
-                writer.WritePropertyName("sequencer"u8);
-                writer.WriteStringValue(Sequencer);
-            }
-            if (Optional.IsDefined(Identity))
-            {
-                writer.WritePropertyName("identity"u8);
-                writer.WriteStringValue(Identity);
-            }
-            writer.WritePropertyName("storageDiagnostics"u8);
-            writer.WriteStartObject();
-            foreach (var item in StorageDiagnostics)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageDirectoryCreatedEventData IJsonModel<StorageDirectoryCreatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageDirectoryCreatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageDirectoryCreatedEventData(document.RootElement, options);
-        }
-
-        internal static StorageDirectoryCreatedEventData DeserializeStorageDirectoryCreatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string api = default;
-            string clientRequestId = default;
-            string requestId = default;
-            string eTag = default;
-            string url = default;
-            string sequencer = default;
-            string identity = default;
-            IReadOnlyDictionary<string, BinaryData> storageDiagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("api"u8))
-                {
-                    api = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("eTag"u8))
-                {
-                    eTag = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("url"u8))
-                {
-                    url = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequencer"u8))
-                {
-                    sequencer = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("identity"u8))
-                {
-                    identity = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("storageDiagnostics"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    storageDiagnostics = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageDirectoryCreatedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                eTag,
-                url,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageDirectoryCreatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageDirectoryCreatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageDirectoryCreatedEventData IPersistableModel<StorageDirectoryCreatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryCreatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageDirectoryCreatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageDirectoryCreatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageDirectoryCreatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageDirectoryCreatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageDirectoryCreatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryCreatedEventData.cs
deleted file mode 100644
index 334e5b3da48f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryCreatedEventData.cs
+++ /dev/null
@@ -1,132 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.DirectoryCreated event. </summary>
-    public partial class StorageDirectoryCreatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryCreatedEventData"/>. </summary>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="storageDiagnostics"/> is null. </exception>
-        internal StorageDirectoryCreatedEventData(IReadOnlyDictionary<string, BinaryData> storageDiagnostics)
-        {
-            Argument.AssertNotNull(storageDiagnostics, nameof(storageDiagnostics));
-
-            StorageDiagnostics = storageDiagnostics;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryCreatedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="eTag"> The etag of the directory at the time this event was triggered. </param>
-        /// <param name="url"> The path to the directory. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageDirectoryCreatedEventData(string api, string clientRequestId, string requestId, string eTag, string url, string sequencer, string identity, IReadOnlyDictionary<string, BinaryData> storageDiagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Api = api;
-            ClientRequestId = clientRequestId;
-            RequestId = requestId;
-            ETag = eTag;
-            Url = url;
-            Sequencer = sequencer;
-            Identity = identity;
-            StorageDiagnostics = storageDiagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryCreatedEventData"/> for deserialization. </summary>
-        internal StorageDirectoryCreatedEventData()
-        {
-        }
-
-        /// <summary> The name of the API/operation that triggered this event. </summary>
-        public string Api { get; }
-        /// <summary> A request id provided by the client of the storage API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The request id generated by the storage service for the storage API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> The etag of the directory at the time this event was triggered. </summary>
-        public string ETag { get; }
-        /// <summary> The path to the directory. </summary>
-        public string Url { get; }
-        /// <summary> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </summary>
-        public string Sequencer { get; }
-        /// <summary> The identity of the requester that triggered this event. </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> StorageDiagnostics { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryDeletedEventData.Serialization.cs
deleted file mode 100644
index 19a1ddb4c0b2..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageDirectoryDeletedEventData : IUtf8JsonSerializable, IJsonModel<StorageDirectoryDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageDirectoryDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageDirectoryDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageDirectoryDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Api))
-            {
-                writer.WritePropertyName("api"u8);
-                writer.WriteStringValue(Api);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Url))
-            {
-                writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Url);
-            }
-            if (Optional.IsDefined(Recursive))
-            {
-                writer.WritePropertyName("recursive"u8);
-                writer.WriteStringValue(Recursive);
-            }
-            if (Optional.IsDefined(Sequencer))
-            {
-                writer.WritePropertyName("sequencer"u8);
-                writer.WriteStringValue(Sequencer);
-            }
-            if (Optional.IsDefined(Identity))
-            {
-                writer.WritePropertyName("identity"u8);
-                writer.WriteStringValue(Identity);
-            }
-            writer.WritePropertyName("storageDiagnostics"u8);
-            writer.WriteStartObject();
-            foreach (var item in StorageDiagnostics)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageDirectoryDeletedEventData IJsonModel<StorageDirectoryDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageDirectoryDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageDirectoryDeletedEventData(document.RootElement, options);
-        }
-
-        internal static StorageDirectoryDeletedEventData DeserializeStorageDirectoryDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string api = default;
-            string clientRequestId = default;
-            string requestId = default;
-            string url = default;
-            string recursive = default;
-            string sequencer = default;
-            string identity = default;
-            IReadOnlyDictionary<string, BinaryData> storageDiagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("api"u8))
-                {
-                    api = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("url"u8))
-                {
-                    url = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("recursive"u8))
-                {
-                    recursive = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequencer"u8))
-                {
-                    sequencer = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("identity"u8))
-                {
-                    identity = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("storageDiagnostics"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    storageDiagnostics = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageDirectoryDeletedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                url,
-                recursive,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageDirectoryDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageDirectoryDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageDirectoryDeletedEventData IPersistableModel<StorageDirectoryDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageDirectoryDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageDirectoryDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageDirectoryDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageDirectoryDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageDirectoryDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryDeletedEventData.cs
deleted file mode 100644
index 11e9573b8fe6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryDeletedEventData.cs
+++ /dev/null
@@ -1,132 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.DirectoryDeleted event. </summary>
-    public partial class StorageDirectoryDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryDeletedEventData"/>. </summary>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="storageDiagnostics"/> is null. </exception>
-        internal StorageDirectoryDeletedEventData(IReadOnlyDictionary<string, BinaryData> storageDiagnostics)
-        {
-            Argument.AssertNotNull(storageDiagnostics, nameof(storageDiagnostics));
-
-            StorageDiagnostics = storageDiagnostics;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryDeletedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="url"> The path to the deleted directory. </param>
-        /// <param name="recursive"> Is this event for a recursive delete operation. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageDirectoryDeletedEventData(string api, string clientRequestId, string requestId, string url, string recursive, string sequencer, string identity, IReadOnlyDictionary<string, BinaryData> storageDiagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Api = api;
-            ClientRequestId = clientRequestId;
-            RequestId = requestId;
-            Url = url;
-            Recursive = recursive;
-            Sequencer = sequencer;
-            Identity = identity;
-            StorageDiagnostics = storageDiagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryDeletedEventData"/> for deserialization. </summary>
-        internal StorageDirectoryDeletedEventData()
-        {
-        }
-
-        /// <summary> The name of the API/operation that triggered this event. </summary>
-        public string Api { get; }
-        /// <summary> A request id provided by the client of the storage API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The request id generated by the storage service for the storage API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> The path to the deleted directory. </summary>
-        public string Url { get; }
-        /// <summary> Is this event for a recursive delete operation. </summary>
-        public string Recursive { get; }
-        /// <summary> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </summary>
-        public string Sequencer { get; }
-        /// <summary> The identity of the requester that triggered this event. </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> StorageDiagnostics { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryRenamedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryRenamedEventData.Serialization.cs
deleted file mode 100644
index 875bac47290a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryRenamedEventData.Serialization.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageDirectoryRenamedEventData : IUtf8JsonSerializable, IJsonModel<StorageDirectoryRenamedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageDirectoryRenamedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageDirectoryRenamedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryRenamedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageDirectoryRenamedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Api))
-            {
-                writer.WritePropertyName("api"u8);
-                writer.WriteStringValue(Api);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(SourceUrl))
-            {
-                writer.WritePropertyName("sourceUrl"u8);
-                writer.WriteStringValue(SourceUrl);
-            }
-            if (Optional.IsDefined(DestinationUrl))
-            {
-                writer.WritePropertyName("destinationUrl"u8);
-                writer.WriteStringValue(DestinationUrl);
-            }
-            if (Optional.IsDefined(Sequencer))
-            {
-                writer.WritePropertyName("sequencer"u8);
-                writer.WriteStringValue(Sequencer);
-            }
-            if (Optional.IsDefined(Identity))
-            {
-                writer.WritePropertyName("identity"u8);
-                writer.WriteStringValue(Identity);
-            }
-            writer.WritePropertyName("storageDiagnostics"u8);
-            writer.WriteStartObject();
-            foreach (var item in StorageDiagnostics)
-            {
-                writer.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    writer.WriteNullValue();
-                    continue;
-                }
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
-                {
-                    JsonSerializer.Serialize(writer, document.RootElement);
-                }
-#endif
-            }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageDirectoryRenamedEventData IJsonModel<StorageDirectoryRenamedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryRenamedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageDirectoryRenamedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageDirectoryRenamedEventData(document.RootElement, options);
-        }
-
-        internal static StorageDirectoryRenamedEventData DeserializeStorageDirectoryRenamedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string api = default;
-            string clientRequestId = default;
-            string requestId = default;
-            string sourceUrl = default;
-            string destinationUrl = default;
-            string sequencer = default;
-            string identity = default;
-            IReadOnlyDictionary<string, BinaryData> storageDiagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("api"u8))
-                {
-                    api = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sourceUrl"u8))
-                {
-                    sourceUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("destinationUrl"u8))
-                {
-                    destinationUrl = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("sequencer"u8))
-                {
-                    sequencer = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("identity"u8))
-                {
-                    identity = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("storageDiagnostics"u8))
-                {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.Value.ValueKind == JsonValueKind.Null)
-                        {
-                            dictionary.Add(property0.Name, null);
-                        }
-                        else
-                        {
-                            dictionary.Add(property0.Name, BinaryData.FromString(property0.Value.GetRawText()));
-                        }
-                    }
-                    storageDiagnostics = dictionary;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageDirectoryRenamedEventData(
-                api,
-                clientRequestId,
-                requestId,
-                sourceUrl,
-                destinationUrl,
-                sequencer,
-                identity,
-                storageDiagnostics,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageDirectoryRenamedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryRenamedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageDirectoryRenamedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageDirectoryRenamedEventData IPersistableModel<StorageDirectoryRenamedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageDirectoryRenamedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageDirectoryRenamedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageDirectoryRenamedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageDirectoryRenamedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageDirectoryRenamedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageDirectoryRenamedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryRenamedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryRenamedEventData.cs
deleted file mode 100644
index acd45cb55670..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageDirectoryRenamedEventData.cs
+++ /dev/null
@@ -1,132 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.DirectoryRenamed event. </summary>
-    public partial class StorageDirectoryRenamedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryRenamedEventData"/>. </summary>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="storageDiagnostics"/> is null. </exception>
-        internal StorageDirectoryRenamedEventData(IReadOnlyDictionary<string, BinaryData> storageDiagnostics)
-        {
-            Argument.AssertNotNull(storageDiagnostics, nameof(storageDiagnostics));
-
-            StorageDiagnostics = storageDiagnostics;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryRenamedEventData"/>. </summary>
-        /// <param name="api"> The name of the API/operation that triggered this event. </param>
-        /// <param name="clientRequestId"> A request id provided by the client of the storage API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the storage service for the storage API operation that triggered this event. </param>
-        /// <param name="sourceUrl"> The path to the directory that was renamed. </param>
-        /// <param name="destinationUrl"> The new path to the directory after the rename operation. </param>
-        /// <param name="sequencer"> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </param>
-        /// <param name="identity"> The identity of the requester that triggered this event. </param>
-        /// <param name="storageDiagnostics"> For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageDirectoryRenamedEventData(string api, string clientRequestId, string requestId, string sourceUrl, string destinationUrl, string sequencer, string identity, IReadOnlyDictionary<string, BinaryData> storageDiagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Api = api;
-            ClientRequestId = clientRequestId;
-            RequestId = requestId;
-            SourceUrl = sourceUrl;
-            DestinationUrl = destinationUrl;
-            Sequencer = sequencer;
-            Identity = identity;
-            StorageDiagnostics = storageDiagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageDirectoryRenamedEventData"/> for deserialization. </summary>
-        internal StorageDirectoryRenamedEventData()
-        {
-        }
-
-        /// <summary> The name of the API/operation that triggered this event. </summary>
-        public string Api { get; }
-        /// <summary> A request id provided by the client of the storage API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The request id generated by the storage service for the storage API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> The path to the directory that was renamed. </summary>
-        public string SourceUrl { get; }
-        /// <summary> The new path to the directory after the rename operation. </summary>
-        public string DestinationUrl { get; }
-        /// <summary> An opaque string value representing the logical sequence of events for any particular directory name. Users can use standard string comparison to understand the relative sequence of two events on the same directory name. </summary>
-        public string Sequencer { get; }
-        /// <summary> The identity of the requester that triggered this event. </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// For service use only. Diagnostic data occasionally included by the Azure Storage service. This property should be ignored by event consumers.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> StorageDiagnostics { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyActionSummaryDetail.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyActionSummaryDetail.Serialization.cs
deleted file mode 100644
index 48221ea12e3a..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyActionSummaryDetail.Serialization.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageLifecyclePolicyActionSummaryDetail : IUtf8JsonSerializable, IJsonModel<StorageLifecyclePolicyActionSummaryDetail>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageLifecyclePolicyActionSummaryDetail>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageLifecyclePolicyActionSummaryDetail>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageLifecyclePolicyActionSummaryDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageLifecyclePolicyActionSummaryDetail)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(TotalObjectsCount))
-            {
-                writer.WritePropertyName("totalObjectsCount"u8);
-                writer.WriteNumberValue(TotalObjectsCount.Value);
-            }
-            if (Optional.IsDefined(SuccessCount))
-            {
-                writer.WritePropertyName("successCount"u8);
-                writer.WriteNumberValue(SuccessCount.Value);
-            }
-            if (Optional.IsDefined(ErrorList))
-            {
-                writer.WritePropertyName("errorList"u8);
-                writer.WriteStringValue(ErrorList);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageLifecyclePolicyActionSummaryDetail IJsonModel<StorageLifecyclePolicyActionSummaryDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageLifecyclePolicyActionSummaryDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageLifecyclePolicyActionSummaryDetail)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageLifecyclePolicyActionSummaryDetail(document.RootElement, options);
-        }
-
-        internal static StorageLifecyclePolicyActionSummaryDetail DeserializeStorageLifecyclePolicyActionSummaryDetail(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            long? totalObjectsCount = default;
-            long? successCount = default;
-            string errorList = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("totalObjectsCount"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    totalObjectsCount = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("successCount"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    successCount = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("errorList"u8))
-                {
-                    errorList = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageLifecyclePolicyActionSummaryDetail(totalObjectsCount, successCount, errorList, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageLifecyclePolicyActionSummaryDetail>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageLifecyclePolicyActionSummaryDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageLifecyclePolicyActionSummaryDetail)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageLifecyclePolicyActionSummaryDetail IPersistableModel<StorageLifecyclePolicyActionSummaryDetail>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageLifecyclePolicyActionSummaryDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageLifecyclePolicyActionSummaryDetail(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageLifecyclePolicyActionSummaryDetail)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageLifecyclePolicyActionSummaryDetail>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageLifecyclePolicyActionSummaryDetail FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageLifecyclePolicyActionSummaryDetail(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyActionSummaryDetail.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyActionSummaryDetail.cs
deleted file mode 100644
index 7593c3cbb679..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyActionSummaryDetail.cs
+++ /dev/null
@@ -1,73 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Execution statistics of a specific policy action in a Blob Management cycle. </summary>
-    public partial class StorageLifecyclePolicyActionSummaryDetail
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageLifecyclePolicyActionSummaryDetail"/>. </summary>
-        internal StorageLifecyclePolicyActionSummaryDetail()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageLifecyclePolicyActionSummaryDetail"/>. </summary>
-        /// <param name="totalObjectsCount"> Total number of objects to be acted on by this action. </param>
-        /// <param name="successCount"> Number of success operations of this action. </param>
-        /// <param name="errorList"> Error messages of this action if any. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageLifecyclePolicyActionSummaryDetail(long? totalObjectsCount, long? successCount, string errorList, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TotalObjectsCount = totalObjectsCount;
-            SuccessCount = successCount;
-            ErrorList = errorList;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Total number of objects to be acted on by this action. </summary>
-        public long? TotalObjectsCount { get; }
-        /// <summary> Number of success operations of this action. </summary>
-        public long? SuccessCount { get; }
-        /// <summary> Error messages of this action if any. </summary>
-        public string ErrorList { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyCompletedEventData.Serialization.cs
deleted file mode 100644
index 7101b2b07c72..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageLifecyclePolicyCompletedEventData : IUtf8JsonSerializable, IJsonModel<StorageLifecyclePolicyCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageLifecyclePolicyCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageLifecyclePolicyCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageLifecyclePolicyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageLifecyclePolicyCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ScheduleTime))
-            {
-                writer.WritePropertyName("scheduleTime"u8);
-                writer.WriteStringValue(ScheduleTime);
-            }
-            writer.WritePropertyName("deleteSummary"u8);
-            writer.WriteObjectValue(DeleteSummary, options);
-            writer.WritePropertyName("tierToCoolSummary"u8);
-            writer.WriteObjectValue(TierToCoolSummary, options);
-            writer.WritePropertyName("tierToArchiveSummary"u8);
-            writer.WriteObjectValue(TierToArchiveSummary, options);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageLifecyclePolicyCompletedEventData IJsonModel<StorageLifecyclePolicyCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageLifecyclePolicyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageLifecyclePolicyCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageLifecyclePolicyCompletedEventData(document.RootElement, options);
-        }
-
-        internal static StorageLifecyclePolicyCompletedEventData DeserializeStorageLifecyclePolicyCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string scheduleTime = default;
-            StorageLifecyclePolicyActionSummaryDetail deleteSummary = default;
-            StorageLifecyclePolicyActionSummaryDetail tierToCoolSummary = default;
-            StorageLifecyclePolicyActionSummaryDetail tierToArchiveSummary = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("scheduleTime"u8))
-                {
-                    scheduleTime = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("deleteSummary"u8))
-                {
-                    deleteSummary = StorageLifecyclePolicyActionSummaryDetail.DeserializeStorageLifecyclePolicyActionSummaryDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("tierToCoolSummary"u8))
-                {
-                    tierToCoolSummary = StorageLifecyclePolicyActionSummaryDetail.DeserializeStorageLifecyclePolicyActionSummaryDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("tierToArchiveSummary"u8))
-                {
-                    tierToArchiveSummary = StorageLifecyclePolicyActionSummaryDetail.DeserializeStorageLifecyclePolicyActionSummaryDetail(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageLifecyclePolicyCompletedEventData(scheduleTime, deleteSummary, tierToCoolSummary, tierToArchiveSummary, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageLifecyclePolicyCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageLifecyclePolicyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageLifecyclePolicyCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageLifecyclePolicyCompletedEventData IPersistableModel<StorageLifecyclePolicyCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageLifecyclePolicyCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageLifecyclePolicyCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageLifecyclePolicyCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageLifecyclePolicyCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageLifecyclePolicyCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageLifecyclePolicyCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyCompletedEventData.cs
deleted file mode 100644
index 392cff3c1e1e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageLifecyclePolicyCompletedEventData.cs
+++ /dev/null
@@ -1,93 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Storage.LifecyclePolicyCompleted event. </summary>
-    public partial class StorageLifecyclePolicyCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageLifecyclePolicyCompletedEventData"/>. </summary>
-        /// <param name="deleteSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <param name="tierToCoolSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <param name="tierToArchiveSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="deleteSummary"/>, <paramref name="tierToCoolSummary"/> or <paramref name="tierToArchiveSummary"/> is null. </exception>
-        internal StorageLifecyclePolicyCompletedEventData(StorageLifecyclePolicyActionSummaryDetail deleteSummary, StorageLifecyclePolicyActionSummaryDetail tierToCoolSummary, StorageLifecyclePolicyActionSummaryDetail tierToArchiveSummary)
-        {
-            Argument.AssertNotNull(deleteSummary, nameof(deleteSummary));
-            Argument.AssertNotNull(tierToCoolSummary, nameof(tierToCoolSummary));
-            Argument.AssertNotNull(tierToArchiveSummary, nameof(tierToArchiveSummary));
-
-            DeleteSummary = deleteSummary;
-            TierToCoolSummary = tierToCoolSummary;
-            TierToArchiveSummary = tierToArchiveSummary;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageLifecyclePolicyCompletedEventData"/>. </summary>
-        /// <param name="scheduleTime"> The time the policy task was scheduled. </param>
-        /// <param name="deleteSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <param name="tierToCoolSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <param name="tierToArchiveSummary"> Execution statistics of a specific policy action in a Blob Management cycle. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageLifecyclePolicyCompletedEventData(string scheduleTime, StorageLifecyclePolicyActionSummaryDetail deleteSummary, StorageLifecyclePolicyActionSummaryDetail tierToCoolSummary, StorageLifecyclePolicyActionSummaryDetail tierToArchiveSummary, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ScheduleTime = scheduleTime;
-            DeleteSummary = deleteSummary;
-            TierToCoolSummary = tierToCoolSummary;
-            TierToArchiveSummary = tierToArchiveSummary;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageLifecyclePolicyCompletedEventData"/> for deserialization. </summary>
-        internal StorageLifecyclePolicyCompletedEventData()
-        {
-        }
-
-        /// <summary> The time the policy task was scheduled. </summary>
-        public string ScheduleTime { get; }
-        /// <summary> Execution statistics of a specific policy action in a Blob Management cycle. </summary>
-        public StorageLifecyclePolicyActionSummaryDetail DeleteSummary { get; }
-        /// <summary> Execution statistics of a specific policy action in a Blob Management cycle. </summary>
-        public StorageLifecyclePolicyActionSummaryDetail TierToCoolSummary { get; }
-        /// <summary> Execution statistics of a specific policy action in a Blob Management cycle. </summary>
-        public StorageLifecyclePolicyActionSummaryDetail TierToArchiveSummary { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedEventData.Serialization.cs
deleted file mode 100644
index 2cea1ef346f1..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageTaskAssignmentCompletedEventData : IUtf8JsonSerializable, IJsonModel<StorageTaskAssignmentCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageTaskAssignmentCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageTaskAssignmentCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskAssignmentCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageTaskAssignmentCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("status"u8);
-            writer.WriteStringValue(Status.ToString());
-            writer.WritePropertyName("completedDateTime"u8);
-            writer.WriteStringValue(CompletedOn, "O");
-            if (Optional.IsDefined(TaskExecutionId))
-            {
-                writer.WritePropertyName("taskExecutionId"u8);
-                writer.WriteStringValue(TaskExecutionId);
-            }
-            if (Optional.IsDefined(TaskName))
-            {
-                writer.WritePropertyName("taskName"u8);
-                writer.WriteStringValue(TaskName);
-            }
-            writer.WritePropertyName("summaryReportBlobUrl"u8);
-            writer.WriteStringValue(SummaryReportBlobUri.AbsoluteUri);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageTaskAssignmentCompletedEventData IJsonModel<StorageTaskAssignmentCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskAssignmentCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageTaskAssignmentCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageTaskAssignmentCompletedEventData(document.RootElement, options);
-        }
-
-        internal static StorageTaskAssignmentCompletedEventData DeserializeStorageTaskAssignmentCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            StorageTaskAssignmentCompletedStatus status = default;
-            DateTimeOffset completedDateTime = default;
-            string taskExecutionId = default;
-            string taskName = default;
-            Uri summaryReportBlobUrl = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("status"u8))
-                {
-                    status = new StorageTaskAssignmentCompletedStatus(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("completedDateTime"u8))
-                {
-                    completedDateTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("taskExecutionId"u8))
-                {
-                    taskExecutionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("taskName"u8))
-                {
-                    taskName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("summaryReportBlobUrl"u8))
-                {
-                    summaryReportBlobUrl = new Uri(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageTaskAssignmentCompletedEventData(
-                status,
-                completedDateTime,
-                taskExecutionId,
-                taskName,
-                summaryReportBlobUrl,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageTaskAssignmentCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskAssignmentCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageTaskAssignmentCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageTaskAssignmentCompletedEventData IPersistableModel<StorageTaskAssignmentCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskAssignmentCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageTaskAssignmentCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageTaskAssignmentCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageTaskAssignmentCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageTaskAssignmentCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageTaskAssignmentCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedEventData.cs
deleted file mode 100644
index acf2da3e348f..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedEventData.cs
+++ /dev/null
@@ -1,95 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for an Microsoft.Storage.StorageTaskAssignmentCompleted event. </summary>
-    public partial class StorageTaskAssignmentCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskAssignmentCompletedEventData"/>. </summary>
-        /// <param name="status"> The status for a storage task. </param>
-        /// <param name="completedOn"> The time at which a storage task was completed. </param>
-        /// <param name="summaryReportBlobUri"> The summary report blob url for a storage task. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="summaryReportBlobUri"/> is null. </exception>
-        internal StorageTaskAssignmentCompletedEventData(StorageTaskAssignmentCompletedStatus status, DateTimeOffset completedOn, Uri summaryReportBlobUri)
-        {
-            Argument.AssertNotNull(summaryReportBlobUri, nameof(summaryReportBlobUri));
-
-            Status = status;
-            CompletedOn = completedOn;
-            SummaryReportBlobUri = summaryReportBlobUri;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskAssignmentCompletedEventData"/>. </summary>
-        /// <param name="status"> The status for a storage task. </param>
-        /// <param name="completedOn"> The time at which a storage task was completed. </param>
-        /// <param name="taskExecutionId"> The execution id for a storage task. </param>
-        /// <param name="taskName"> The task name for a storage task. </param>
-        /// <param name="summaryReportBlobUri"> The summary report blob url for a storage task. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageTaskAssignmentCompletedEventData(StorageTaskAssignmentCompletedStatus status, DateTimeOffset completedOn, string taskExecutionId, string taskName, Uri summaryReportBlobUri, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Status = status;
-            CompletedOn = completedOn;
-            TaskExecutionId = taskExecutionId;
-            TaskName = taskName;
-            SummaryReportBlobUri = summaryReportBlobUri;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskAssignmentCompletedEventData"/> for deserialization. </summary>
-        internal StorageTaskAssignmentCompletedEventData()
-        {
-        }
-
-        /// <summary> The status for a storage task. </summary>
-        public StorageTaskAssignmentCompletedStatus Status { get; }
-        /// <summary> The time at which a storage task was completed. </summary>
-        public DateTimeOffset CompletedOn { get; }
-        /// <summary> The execution id for a storage task. </summary>
-        public string TaskExecutionId { get; }
-        /// <summary> The task name for a storage task. </summary>
-        public string TaskName { get; }
-        /// <summary> The summary report blob url for a storage task. </summary>
-        public Uri SummaryReportBlobUri { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedStatus.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedStatus.cs
deleted file mode 100644
index efa113f414d9..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentCompletedStatus.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The status for a storage task. </summary>
-    public readonly partial struct StorageTaskAssignmentCompletedStatus : IEquatable<StorageTaskAssignmentCompletedStatus>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskAssignmentCompletedStatus"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public StorageTaskAssignmentCompletedStatus(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string SucceededValue = "Succeeded";
-        private const string FailedValue = "Failed";
-
-        /// <summary> Succeeded. </summary>
-        public static StorageTaskAssignmentCompletedStatus Succeeded { get; } = new StorageTaskAssignmentCompletedStatus(SucceededValue);
-        /// <summary> Failed. </summary>
-        public static StorageTaskAssignmentCompletedStatus Failed { get; } = new StorageTaskAssignmentCompletedStatus(FailedValue);
-        /// <summary> Determines if two <see cref="StorageTaskAssignmentCompletedStatus"/> values are the same. </summary>
-        public static bool operator ==(StorageTaskAssignmentCompletedStatus left, StorageTaskAssignmentCompletedStatus right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="StorageTaskAssignmentCompletedStatus"/> values are not the same. </summary>
-        public static bool operator !=(StorageTaskAssignmentCompletedStatus left, StorageTaskAssignmentCompletedStatus right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="StorageTaskAssignmentCompletedStatus"/>. </summary>
-        public static implicit operator StorageTaskAssignmentCompletedStatus(string value) => new StorageTaskAssignmentCompletedStatus(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is StorageTaskAssignmentCompletedStatus other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(StorageTaskAssignmentCompletedStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentQueuedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentQueuedEventData.Serialization.cs
deleted file mode 100644
index bb9d126de7c0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentQueuedEventData.Serialization.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageTaskAssignmentQueuedEventData : IUtf8JsonSerializable, IJsonModel<StorageTaskAssignmentQueuedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageTaskAssignmentQueuedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageTaskAssignmentQueuedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskAssignmentQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageTaskAssignmentQueuedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("queuedDateTime"u8);
-            writer.WriteStringValue(QueuedOn, "O");
-            if (Optional.IsDefined(TaskExecutionId))
-            {
-                writer.WritePropertyName("taskExecutionId"u8);
-                writer.WriteStringValue(TaskExecutionId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageTaskAssignmentQueuedEventData IJsonModel<StorageTaskAssignmentQueuedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskAssignmentQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageTaskAssignmentQueuedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageTaskAssignmentQueuedEventData(document.RootElement, options);
-        }
-
-        internal static StorageTaskAssignmentQueuedEventData DeserializeStorageTaskAssignmentQueuedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset queuedDateTime = default;
-            string taskExecutionId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queuedDateTime"u8))
-                {
-                    queuedDateTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("taskExecutionId"u8))
-                {
-                    taskExecutionId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageTaskAssignmentQueuedEventData(queuedDateTime, taskExecutionId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageTaskAssignmentQueuedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskAssignmentQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageTaskAssignmentQueuedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageTaskAssignmentQueuedEventData IPersistableModel<StorageTaskAssignmentQueuedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskAssignmentQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageTaskAssignmentQueuedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageTaskAssignmentQueuedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageTaskAssignmentQueuedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageTaskAssignmentQueuedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageTaskAssignmentQueuedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentQueuedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentQueuedEventData.cs
deleted file mode 100644
index 629cae0b0418..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskAssignmentQueuedEventData.cs
+++ /dev/null
@@ -1,76 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for an Microsoft.Storage.StorageTaskAssignmentQueued event. </summary>
-    public partial class StorageTaskAssignmentQueuedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskAssignmentQueuedEventData"/>. </summary>
-        /// <param name="queuedOn"> The time at which a storage task was queued. </param>
-        internal StorageTaskAssignmentQueuedEventData(DateTimeOffset queuedOn)
-        {
-            QueuedOn = queuedOn;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskAssignmentQueuedEventData"/>. </summary>
-        /// <param name="queuedOn"> The time at which a storage task was queued. </param>
-        /// <param name="taskExecutionId"> The execution id for a storage task. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageTaskAssignmentQueuedEventData(DateTimeOffset queuedOn, string taskExecutionId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            QueuedOn = queuedOn;
-            TaskExecutionId = taskExecutionId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskAssignmentQueuedEventData"/> for deserialization. </summary>
-        internal StorageTaskAssignmentQueuedEventData()
-        {
-        }
-
-        /// <summary> The time at which a storage task was queued. </summary>
-        public DateTimeOffset QueuedOn { get; }
-        /// <summary> The execution id for a storage task. </summary>
-        public string TaskExecutionId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedEventData.Serialization.cs
deleted file mode 100644
index 1e4db6040fab..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageTaskCompletedEventData : IUtf8JsonSerializable, IJsonModel<StorageTaskCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageTaskCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageTaskCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageTaskCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("status"u8);
-            writer.WriteStringValue(Status.ToString());
-            writer.WritePropertyName("completedDateTime"u8);
-            writer.WriteStringValue(CompletedDateTime, "O");
-            if (Optional.IsDefined(TaskExecutionId))
-            {
-                writer.WritePropertyName("taskExecutionId"u8);
-                writer.WriteStringValue(TaskExecutionId);
-            }
-            if (Optional.IsDefined(TaskName))
-            {
-                writer.WritePropertyName("taskName"u8);
-                writer.WriteStringValue(TaskName);
-            }
-            writer.WritePropertyName("summaryReportBlobUrl"u8);
-            writer.WriteStringValue(SummaryReportBlobUrl.AbsoluteUri);
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageTaskCompletedEventData IJsonModel<StorageTaskCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageTaskCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageTaskCompletedEventData(document.RootElement, options);
-        }
-
-        internal static StorageTaskCompletedEventData DeserializeStorageTaskCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            StorageTaskCompletedStatus status = default;
-            DateTimeOffset completedDateTime = default;
-            string taskExecutionId = default;
-            string taskName = default;
-            Uri summaryReportBlobUrl = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("status"u8))
-                {
-                    status = new StorageTaskCompletedStatus(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("completedDateTime"u8))
-                {
-                    completedDateTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("taskExecutionId"u8))
-                {
-                    taskExecutionId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("taskName"u8))
-                {
-                    taskName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("summaryReportBlobUrl"u8))
-                {
-                    summaryReportBlobUrl = new Uri(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageTaskCompletedEventData(
-                status,
-                completedDateTime,
-                taskExecutionId,
-                taskName,
-                summaryReportBlobUrl,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageTaskCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageTaskCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageTaskCompletedEventData IPersistableModel<StorageTaskCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageTaskCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageTaskCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageTaskCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageTaskCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageTaskCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedEventData.cs
deleted file mode 100644
index a7e3b6af287d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedEventData.cs
+++ /dev/null
@@ -1,95 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for an Microsoft.Storage.StorageTaskCompleted event. </summary>
-    public partial class StorageTaskCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskCompletedEventData"/>. </summary>
-        /// <param name="status"> The status for a storage task. </param>
-        /// <param name="completedDateTime"> The time at which a storage task was completed. </param>
-        /// <param name="summaryReportBlobUrl"> The summary report blob url for a storage task. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="summaryReportBlobUrl"/> is null. </exception>
-        internal StorageTaskCompletedEventData(StorageTaskCompletedStatus status, DateTimeOffset completedDateTime, Uri summaryReportBlobUrl)
-        {
-            Argument.AssertNotNull(summaryReportBlobUrl, nameof(summaryReportBlobUrl));
-
-            Status = status;
-            CompletedDateTime = completedDateTime;
-            SummaryReportBlobUrl = summaryReportBlobUrl;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskCompletedEventData"/>. </summary>
-        /// <param name="status"> The status for a storage task. </param>
-        /// <param name="completedDateTime"> The time at which a storage task was completed. </param>
-        /// <param name="taskExecutionId"> The execution id for a storage task. </param>
-        /// <param name="taskName"> The task name for a storage task. </param>
-        /// <param name="summaryReportBlobUrl"> The summary report blob url for a storage task. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageTaskCompletedEventData(StorageTaskCompletedStatus status, DateTimeOffset completedDateTime, string taskExecutionId, string taskName, Uri summaryReportBlobUrl, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Status = status;
-            CompletedDateTime = completedDateTime;
-            TaskExecutionId = taskExecutionId;
-            TaskName = taskName;
-            SummaryReportBlobUrl = summaryReportBlobUrl;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskCompletedEventData"/> for deserialization. </summary>
-        internal StorageTaskCompletedEventData()
-        {
-        }
-
-        /// <summary> The status for a storage task. </summary>
-        public StorageTaskCompletedStatus Status { get; }
-        /// <summary> The time at which a storage task was completed. </summary>
-        public DateTimeOffset CompletedDateTime { get; }
-        /// <summary> The execution id for a storage task. </summary>
-        public string TaskExecutionId { get; }
-        /// <summary> The task name for a storage task. </summary>
-        public string TaskName { get; }
-        /// <summary> The summary report blob url for a storage task. </summary>
-        public Uri SummaryReportBlobUrl { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedStatus.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedStatus.cs
deleted file mode 100644
index a7df13a5681c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskCompletedStatus.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> The status for a storage task. </summary>
-    public readonly partial struct StorageTaskCompletedStatus : IEquatable<StorageTaskCompletedStatus>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskCompletedStatus"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public StorageTaskCompletedStatus(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string SucceededValue = "Succeeded";
-        private const string FailedValue = "Failed";
-
-        /// <summary> Succeeded. </summary>
-        public static StorageTaskCompletedStatus Succeeded { get; } = new StorageTaskCompletedStatus(SucceededValue);
-        /// <summary> Failed. </summary>
-        public static StorageTaskCompletedStatus Failed { get; } = new StorageTaskCompletedStatus(FailedValue);
-        /// <summary> Determines if two <see cref="StorageTaskCompletedStatus"/> values are the same. </summary>
-        public static bool operator ==(StorageTaskCompletedStatus left, StorageTaskCompletedStatus right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="StorageTaskCompletedStatus"/> values are not the same. </summary>
-        public static bool operator !=(StorageTaskCompletedStatus left, StorageTaskCompletedStatus right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="StorageTaskCompletedStatus"/>. </summary>
-        public static implicit operator StorageTaskCompletedStatus(string value) => new StorageTaskCompletedStatus(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is StorageTaskCompletedStatus other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(StorageTaskCompletedStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskQueuedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskQueuedEventData.Serialization.cs
deleted file mode 100644
index 2b6547d43360..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskQueuedEventData.Serialization.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class StorageTaskQueuedEventData : IUtf8JsonSerializable, IJsonModel<StorageTaskQueuedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StorageTaskQueuedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<StorageTaskQueuedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageTaskQueuedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("queuedDateTime"u8);
-            writer.WriteStringValue(QueuedDateTime, "O");
-            if (Optional.IsDefined(TaskExecutionId))
-            {
-                writer.WritePropertyName("taskExecutionId"u8);
-                writer.WriteStringValue(TaskExecutionId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        StorageTaskQueuedEventData IJsonModel<StorageTaskQueuedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(StorageTaskQueuedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeStorageTaskQueuedEventData(document.RootElement, options);
-        }
-
-        internal static StorageTaskQueuedEventData DeserializeStorageTaskQueuedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            DateTimeOffset queuedDateTime = default;
-            string taskExecutionId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("queuedDateTime"u8))
-                {
-                    queuedDateTime = property.Value.GetDateTimeOffset("O");
-                    continue;
-                }
-                if (property.NameEquals("taskExecutionId"u8))
-                {
-                    taskExecutionId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new StorageTaskQueuedEventData(queuedDateTime, taskExecutionId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<StorageTaskQueuedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(StorageTaskQueuedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        StorageTaskQueuedEventData IPersistableModel<StorageTaskQueuedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<StorageTaskQueuedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeStorageTaskQueuedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(StorageTaskQueuedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<StorageTaskQueuedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static StorageTaskQueuedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeStorageTaskQueuedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskQueuedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskQueuedEventData.cs
deleted file mode 100644
index 0ad77410c7c3..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/StorageTaskQueuedEventData.cs
+++ /dev/null
@@ -1,76 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for an Microsoft.Storage.StorageTaskQueued event. </summary>
-    public partial class StorageTaskQueuedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskQueuedEventData"/>. </summary>
-        /// <param name="queuedDateTime"> The time at which a storage task was queued. </param>
-        internal StorageTaskQueuedEventData(DateTimeOffset queuedDateTime)
-        {
-            QueuedDateTime = queuedDateTime;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskQueuedEventData"/>. </summary>
-        /// <param name="queuedDateTime"> The time at which a storage task was queued. </param>
-        /// <param name="taskExecutionId"> The execution id for a storage task. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StorageTaskQueuedEventData(DateTimeOffset queuedDateTime, string taskExecutionId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            QueuedDateTime = queuedDateTime;
-            TaskExecutionId = taskExecutionId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="StorageTaskQueuedEventData"/> for deserialization. </summary>
-        internal StorageTaskQueuedEventData()
-        {
-        }
-
-        /// <summary> The time at which a storage task was queued. </summary>
-        public DateTimeOffset QueuedDateTime { get; }
-        /// <summary> The execution id for a storage task. </summary>
-        public string TaskExecutionId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionDeletedEventData.Serialization.cs
deleted file mode 100644
index 118af3e2917b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionDeletedEventData.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class SubscriptionDeletedEventData : IUtf8JsonSerializable, IJsonModel<SubscriptionDeletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SubscriptionDeletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SubscriptionDeletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SubscriptionDeletedEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(EventSubscriptionId))
-            {
-                writer.WritePropertyName("eventSubscriptionId"u8);
-                writer.WriteStringValue(EventSubscriptionId);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        SubscriptionDeletedEventData IJsonModel<SubscriptionDeletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SubscriptionDeletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSubscriptionDeletedEventData(document.RootElement, options);
-        }
-
-        internal static SubscriptionDeletedEventData DeserializeSubscriptionDeletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string eventSubscriptionId = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("eventSubscriptionId"u8))
-                {
-                    eventSubscriptionId = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SubscriptionDeletedEventData(eventSubscriptionId, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SubscriptionDeletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(SubscriptionDeletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SubscriptionDeletedEventData IPersistableModel<SubscriptionDeletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionDeletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeSubscriptionDeletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SubscriptionDeletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SubscriptionDeletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static SubscriptionDeletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeSubscriptionDeletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionDeletedEventData.cs
deleted file mode 100644
index 323175400bcf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionDeletedEventData.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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// Schema of the Data property of an EventGridEvent for a
-    /// Microsoft.EventGrid.SubscriptionDeletedEvent event.
-    /// </summary>
-    public partial class SubscriptionDeletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SubscriptionDeletedEventData"/>. </summary>
-        internal SubscriptionDeletedEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SubscriptionDeletedEventData"/>. </summary>
-        /// <param name="eventSubscriptionId"> The Azure resource ID of the deleted event subscription. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SubscriptionDeletedEventData(string eventSubscriptionId, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            EventSubscriptionId = eventSubscriptionId;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The Azure resource ID of the deleted event subscription. </summary>
-        public string EventSubscriptionId { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationEventData.Serialization.cs
deleted file mode 100644
index 73797c8a2b8b..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationEventData.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class SubscriptionValidationEventData : IUtf8JsonSerializable, IJsonModel<SubscriptionValidationEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SubscriptionValidationEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SubscriptionValidationEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionValidationEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SubscriptionValidationEventData)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ValidationCode))
-            {
-                writer.WritePropertyName("validationCode"u8);
-                writer.WriteStringValue(ValidationCode);
-            }
-            if (Optional.IsDefined(ValidationUrl))
-            {
-                writer.WritePropertyName("validationUrl"u8);
-                writer.WriteStringValue(ValidationUrl);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        SubscriptionValidationEventData IJsonModel<SubscriptionValidationEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionValidationEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SubscriptionValidationEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSubscriptionValidationEventData(document.RootElement, options);
-        }
-
-        internal static SubscriptionValidationEventData DeserializeSubscriptionValidationEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string validationCode = default;
-            string validationUrl = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("validationCode"u8))
-                {
-                    validationCode = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("validationUrl"u8))
-                {
-                    validationUrl = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SubscriptionValidationEventData(validationCode, validationUrl, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SubscriptionValidationEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionValidationEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(SubscriptionValidationEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SubscriptionValidationEventData IPersistableModel<SubscriptionValidationEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionValidationEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeSubscriptionValidationEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SubscriptionValidationEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SubscriptionValidationEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static SubscriptionValidationEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeSubscriptionValidationEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationEventData.cs
deleted file mode 100644
index 78d90aa69318..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationEventData.cs
+++ /dev/null
@@ -1,85 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.EventGrid.SubscriptionValidationEvent event. </summary>
-    public partial class SubscriptionValidationEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SubscriptionValidationEventData"/>. </summary>
-        internal SubscriptionValidationEventData()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SubscriptionValidationEventData"/>. </summary>
-        /// <param name="validationCode">
-        /// The validation code sent by Azure Event Grid to validate an event subscription.
-        /// To complete the validation handshake, the subscriber must either respond with this validation code as part of the validation response,
-        /// or perform a GET request on the validationUrl (available starting version 2018-05-01-preview).
-        /// </param>
-        /// <param name="validationUrl">
-        /// The validation URL sent by Azure Event Grid (available starting version 2018-05-01-preview).
-        /// To complete the validation handshake, the subscriber must either respond with the validationCode as part of the validation response,
-        /// or perform a GET request on the validationUrl (available starting version 2018-05-01-preview).
-        /// </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SubscriptionValidationEventData(string validationCode, string validationUrl, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ValidationCode = validationCode;
-            ValidationUrl = validationUrl;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary>
-        /// The validation code sent by Azure Event Grid to validate an event subscription.
-        /// To complete the validation handshake, the subscriber must either respond with this validation code as part of the validation response,
-        /// or perform a GET request on the validationUrl (available starting version 2018-05-01-preview).
-        /// </summary>
-        public string ValidationCode { get; }
-        /// <summary>
-        /// The validation URL sent by Azure Event Grid (available starting version 2018-05-01-preview).
-        /// To complete the validation handshake, the subscriber must either respond with the validationCode as part of the validation response,
-        /// or perform a GET request on the validationUrl (available starting version 2018-05-01-preview).
-        /// </summary>
-        public string ValidationUrl { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationResponse.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationResponse.Serialization.cs
deleted file mode 100644
index 5b5ffbe5c353..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationResponse.Serialization.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class SubscriptionValidationResponse : IUtf8JsonSerializable, IJsonModel<SubscriptionValidationResponse>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SubscriptionValidationResponse>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SubscriptionValidationResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionValidationResponse>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SubscriptionValidationResponse)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ValidationResponse))
-            {
-                writer.WritePropertyName("validationResponse"u8);
-                writer.WriteStringValue(ValidationResponse);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        SubscriptionValidationResponse IJsonModel<SubscriptionValidationResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionValidationResponse>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SubscriptionValidationResponse)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSubscriptionValidationResponse(document.RootElement, options);
-        }
-
-        internal static SubscriptionValidationResponse DeserializeSubscriptionValidationResponse(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string validationResponse = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("validationResponse"u8))
-                {
-                    validationResponse = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SubscriptionValidationResponse(validationResponse, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SubscriptionValidationResponse>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionValidationResponse>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(SubscriptionValidationResponse)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SubscriptionValidationResponse IPersistableModel<SubscriptionValidationResponse>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SubscriptionValidationResponse>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeSubscriptionValidationResponse(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SubscriptionValidationResponse)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SubscriptionValidationResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static SubscriptionValidationResponse FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeSubscriptionValidationResponse(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationResponse.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationResponse.cs
deleted file mode 100644
index 7343bc21df38..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SubscriptionValidationResponse.cs
+++ /dev/null
@@ -1,70 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary>
-    /// To complete an event subscription validation handshake, a subscriber can use
-    /// either the validationCode or the validationUrl received in a
-    /// SubscriptionValidationEvent. When the validationCode is used, the
-    /// SubscriptionValidationResponse can be used to build the response.
-    /// </summary>
-    public partial class SubscriptionValidationResponse
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SubscriptionValidationResponse"/>. </summary>
-        internal SubscriptionValidationResponse()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SubscriptionValidationResponse"/>. </summary>
-        /// <param name="validationResponse"> The validation response sent by the subscriber to Azure Event Grid to complete the validation of an event subscription. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SubscriptionValidationResponse(string validationResponse, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ValidationResponse = validationResponse;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The validation response sent by the subscriber to Azure Event Grid to complete the validation of an event subscription. </summary>
-        public string ValidationResponse { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SystemEventsClientOptions.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SystemEventsClientOptions.cs
index 0d99553ffa77..17e37e2f9d4b 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SystemEventsClientOptions.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/SystemEventsClientOptions.cs
@@ -13,13 +13,13 @@ namespace Azure.Messaging.EventGrid.SystemEvents
     /// <summary> Client options for SystemEventsClient. </summary>
     internal partial class SystemEventsClientOptions : ClientOptions
     {
-        private const ServiceVersion LatestVersion = ServiceVersion.V2024_01_01;
+        private const ServiceVersion LatestVersion = ServiceVersion.V2018_01_01;
 
         /// <summary> The version of the service to use. </summary>
         internal enum ServiceVersion
         {
-            /// <summary> Service version "2024-01-01". </summary>
-            V2024_01_01 = 1,
+            /// <summary> Service version "2018-01-01". </summary>
+            V2018_01_01 = 1,
         }
 
         internal string Version { get; }
@@ -29,7 +29,7 @@ public SystemEventsClientOptions(ServiceVersion version = LatestVersion)
         {
             Version = version switch
             {
-                ServiceVersion.V2024_01_01 => "2024-01-01",
+                ServiceVersion.V2018_01_01 => "2018-01-01",
                 _ => throw new NotSupportedException()
             };
         }
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/UnknownMediaJobOutput.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/UnknownMediaJobOutput.Serialization.cs
deleted file mode 100644
index 237a41a34578..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/UnknownMediaJobOutput.Serialization.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    internal partial class UnknownMediaJobOutput : IUtf8JsonSerializable, IJsonModel<MediaJobOutput>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MediaJobOutput>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<MediaJobOutput>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutput>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutput)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-        }
-
-        MediaJobOutput IJsonModel<MediaJobOutput>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutput>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MediaJobOutput)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMediaJobOutput(document.RootElement, options);
-        }
-
-        internal static UnknownMediaJobOutput DeserializeUnknownMediaJobOutput(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string odataType = "Unknown";
-            MediaJobError error = default;
-            string label = default;
-            long progress = default;
-            MediaJobState state = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("@odata.type"u8))
-                {
-                    odataType = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("error"u8))
-                {
-                    error = MediaJobError.DeserializeMediaJobError(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("label"u8))
-                {
-                    label = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("progress"u8))
-                {
-                    progress = property.Value.GetInt64();
-                    continue;
-                }
-                if (property.NameEquals("state"u8))
-                {
-                    state = new MediaJobState(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new UnknownMediaJobOutput(
-                odataType,
-                error,
-                label,
-                progress,
-                state,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<MediaJobOutput>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutput>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutput)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MediaJobOutput IPersistableModel<MediaJobOutput>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MediaJobOutput>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMediaJobOutput(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MediaJobOutput)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MediaJobOutput>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new UnknownMediaJobOutput FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeUnknownMediaJobOutput(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue<MediaJobOutput>(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/UnknownMediaJobOutput.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/UnknownMediaJobOutput.cs
deleted file mode 100644
index 0bfb2f76e943..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/UnknownMediaJobOutput.cs
+++ /dev/null
@@ -1,32 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Unknown version of MediaJobOutput. </summary>
-    internal partial class UnknownMediaJobOutput : MediaJobOutput
-    {
-        /// <summary> Initializes a new instance of <see cref="UnknownMediaJobOutput"/>. </summary>
-        /// <param name="odataType"> The discriminator for derived types. </param>
-        /// <param name="error"> Gets the Job output error. </param>
-        /// <param name="label"> Gets the Job output label. </param>
-        /// <param name="progress"> Gets the Job output progress. </param>
-        /// <param name="state"> Gets the Job output state. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal UnknownMediaJobOutput(string odataType, MediaJobError error, string label, long progress, MediaJobState state, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(odataType, error, label, progress, state, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="UnknownMediaJobOutput"/> for deserialization. </summary>
-        internal UnknownMediaJobOutput()
-        {
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventData.Serialization.cs
deleted file mode 100644
index d080ac40d78d..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebAppServicePlanUpdatedEventData : IUtf8JsonSerializable, IJsonModel<WebAppServicePlanUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebAppServicePlanUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebAppServicePlanUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppServicePlanUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebAppServicePlanUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appServicePlanEventTypeDetail"u8);
-            writer.WriteObjectValue(AppServicePlanEventTypeDetail, options);
-            writer.WritePropertyName("sku"u8);
-            writer.WriteObjectValue(Sku, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebAppServicePlanUpdatedEventData IJsonModel<WebAppServicePlanUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppServicePlanUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebAppServicePlanUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebAppServicePlanUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static WebAppServicePlanUpdatedEventData DeserializeWebAppServicePlanUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppServicePlanEventTypeDetail appServicePlanEventTypeDetail = default;
-            WebAppServicePlanUpdatedEventDataSku sku = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appServicePlanEventTypeDetail"u8))
-                {
-                    appServicePlanEventTypeDetail = AppServicePlanEventTypeDetail.DeserializeAppServicePlanEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("sku"u8))
-                {
-                    sku = WebAppServicePlanUpdatedEventDataSku.DeserializeWebAppServicePlanUpdatedEventDataSku(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebAppServicePlanUpdatedEventData(
-                appServicePlanEventTypeDetail,
-                sku,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebAppServicePlanUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppServicePlanUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebAppServicePlanUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebAppServicePlanUpdatedEventData IPersistableModel<WebAppServicePlanUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppServicePlanUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebAppServicePlanUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebAppServicePlanUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebAppServicePlanUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebAppServicePlanUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebAppServicePlanUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventData.cs
deleted file mode 100644
index 8b072da944e6..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventData.cs
+++ /dev/null
@@ -1,106 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.AppServicePlanUpdated event. </summary>
-    public partial class WebAppServicePlanUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebAppServicePlanUpdatedEventData"/>. </summary>
-        /// <param name="appServicePlanEventTypeDetail"> Detail of action on the app service plan. </param>
-        /// <param name="sku"> sku of app service plan. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appServicePlanEventTypeDetail"/> or <paramref name="sku"/> is null. </exception>
-        internal WebAppServicePlanUpdatedEventData(AppServicePlanEventTypeDetail appServicePlanEventTypeDetail, WebAppServicePlanUpdatedEventDataSku sku)
-        {
-            Argument.AssertNotNull(appServicePlanEventTypeDetail, nameof(appServicePlanEventTypeDetail));
-            Argument.AssertNotNull(sku, nameof(sku));
-
-            AppServicePlanEventTypeDetail = appServicePlanEventTypeDetail;
-            Sku = sku;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebAppServicePlanUpdatedEventData"/>. </summary>
-        /// <param name="appServicePlanEventTypeDetail"> Detail of action on the app service plan. </param>
-        /// <param name="sku"> sku of app service plan. </param>
-        /// <param name="name"> name of the app service plan that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the app service plan API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the app service plan API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the app service plan API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebAppServicePlanUpdatedEventData(AppServicePlanEventTypeDetail appServicePlanEventTypeDetail, WebAppServicePlanUpdatedEventDataSku sku, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppServicePlanEventTypeDetail = appServicePlanEventTypeDetail;
-            Sku = sku;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebAppServicePlanUpdatedEventData"/> for deserialization. </summary>
-        internal WebAppServicePlanUpdatedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app service plan. </summary>
-        public AppServicePlanEventTypeDetail AppServicePlanEventTypeDetail { get; }
-        /// <summary> sku of app service plan. </summary>
-        public WebAppServicePlanUpdatedEventDataSku Sku { get; }
-        /// <summary> name of the app service plan that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the app service plan API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the app service plan API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the app service plan API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventDataSku.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventDataSku.Serialization.cs
deleted file mode 100644
index 6f468fc9ebf0..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventDataSku.Serialization.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebAppServicePlanUpdatedEventDataSku : IUtf8JsonSerializable, IJsonModel<WebAppServicePlanUpdatedEventDataSku>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebAppServicePlanUpdatedEventDataSku>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebAppServicePlanUpdatedEventDataSku>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppServicePlanUpdatedEventDataSku>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebAppServicePlanUpdatedEventDataSku)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Tier))
-            {
-                writer.WritePropertyName("Tier"u8);
-                writer.WriteStringValue(Tier);
-            }
-            if (Optional.IsDefined(Size))
-            {
-                writer.WritePropertyName("Size"u8);
-                writer.WriteStringValue(Size);
-            }
-            if (Optional.IsDefined(Family))
-            {
-                writer.WritePropertyName("Family"u8);
-                writer.WriteStringValue(Family);
-            }
-            if (Optional.IsDefined(Capacity))
-            {
-                writer.WritePropertyName("Capacity"u8);
-                writer.WriteStringValue(Capacity);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebAppServicePlanUpdatedEventDataSku IJsonModel<WebAppServicePlanUpdatedEventDataSku>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppServicePlanUpdatedEventDataSku>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebAppServicePlanUpdatedEventDataSku)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebAppServicePlanUpdatedEventDataSku(document.RootElement, options);
-        }
-
-        internal static WebAppServicePlanUpdatedEventDataSku DeserializeWebAppServicePlanUpdatedEventDataSku(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            string tier = default;
-            string size = default;
-            string family = default;
-            string capacity = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Tier"u8))
-                {
-                    tier = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Size"u8))
-                {
-                    size = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Family"u8))
-                {
-                    family = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("Capacity"u8))
-                {
-                    capacity = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebAppServicePlanUpdatedEventDataSku(
-                name,
-                tier,
-                size,
-                family,
-                capacity,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebAppServicePlanUpdatedEventDataSku>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppServicePlanUpdatedEventDataSku>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebAppServicePlanUpdatedEventDataSku)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebAppServicePlanUpdatedEventDataSku IPersistableModel<WebAppServicePlanUpdatedEventDataSku>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppServicePlanUpdatedEventDataSku>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebAppServicePlanUpdatedEventDataSku(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebAppServicePlanUpdatedEventDataSku)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebAppServicePlanUpdatedEventDataSku>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebAppServicePlanUpdatedEventDataSku FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebAppServicePlanUpdatedEventDataSku(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventDataSku.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventDataSku.cs
deleted file mode 100644
index 775bf2394abd..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppServicePlanUpdatedEventDataSku.cs
+++ /dev/null
@@ -1,81 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> sku of app service plan. </summary>
-    public partial class WebAppServicePlanUpdatedEventDataSku
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebAppServicePlanUpdatedEventDataSku"/>. </summary>
-        internal WebAppServicePlanUpdatedEventDataSku()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebAppServicePlanUpdatedEventDataSku"/>. </summary>
-        /// <param name="name"> name of app service plan sku. </param>
-        /// <param name="tier"> tier of app service plan sku. </param>
-        /// <param name="size"> size of app service plan sku. </param>
-        /// <param name="family"> family of app service plan sku. </param>
-        /// <param name="capacity"> capacity of app service plan sku. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebAppServicePlanUpdatedEventDataSku(string name, string tier, string size, string family, string capacity, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Name = name;
-            Tier = tier;
-            Size = size;
-            Family = family;
-            Capacity = capacity;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> name of app service plan sku. </summary>
-        public string Name { get; }
-        /// <summary> tier of app service plan sku. </summary>
-        public string Tier { get; }
-        /// <summary> size of app service plan sku. </summary>
-        public string Size { get; }
-        /// <summary> family of app service plan sku. </summary>
-        public string Family { get; }
-        /// <summary> capacity of app service plan sku. </summary>
-        public string Capacity { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppUpdatedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppUpdatedEventData.Serialization.cs
deleted file mode 100644
index 1ad3d2774328..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppUpdatedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebAppUpdatedEventData : IUtf8JsonSerializable, IJsonModel<WebAppUpdatedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebAppUpdatedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebAppUpdatedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebAppUpdatedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebAppUpdatedEventData IJsonModel<WebAppUpdatedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebAppUpdatedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebAppUpdatedEventData(document.RootElement, options);
-        }
-
-        internal static WebAppUpdatedEventData DeserializeWebAppUpdatedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebAppUpdatedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebAppUpdatedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebAppUpdatedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebAppUpdatedEventData IPersistableModel<WebAppUpdatedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebAppUpdatedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebAppUpdatedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebAppUpdatedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebAppUpdatedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebAppUpdatedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebAppUpdatedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppUpdatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppUpdatedEventData.cs
deleted file mode 100644
index f2d7d0dea273..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebAppUpdatedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.AppUpdated event. </summary>
-    public partial class WebAppUpdatedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebAppUpdatedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebAppUpdatedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebAppUpdatedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebAppUpdatedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebAppUpdatedEventData"/> for deserialization. </summary>
-        internal WebAppUpdatedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationCompletedEventData.Serialization.cs
deleted file mode 100644
index 3ba9f6644c88..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebBackupOperationCompletedEventData : IUtf8JsonSerializable, IJsonModel<WebBackupOperationCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebBackupOperationCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebBackupOperationCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebBackupOperationCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebBackupOperationCompletedEventData IJsonModel<WebBackupOperationCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebBackupOperationCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebBackupOperationCompletedEventData(document.RootElement, options);
-        }
-
-        internal static WebBackupOperationCompletedEventData DeserializeWebBackupOperationCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebBackupOperationCompletedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebBackupOperationCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebBackupOperationCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebBackupOperationCompletedEventData IPersistableModel<WebBackupOperationCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebBackupOperationCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebBackupOperationCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebBackupOperationCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebBackupOperationCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebBackupOperationCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationCompletedEventData.cs
deleted file mode 100644
index 690319b63466..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationCompletedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.BackupOperationCompleted event. </summary>
-    public partial class WebBackupOperationCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebBackupOperationCompletedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebBackupOperationCompletedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationCompletedEventData"/> for deserialization. </summary>
-        internal WebBackupOperationCompletedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationFailedEventData.Serialization.cs
deleted file mode 100644
index 8747eb522d65..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebBackupOperationFailedEventData : IUtf8JsonSerializable, IJsonModel<WebBackupOperationFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebBackupOperationFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebBackupOperationFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebBackupOperationFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebBackupOperationFailedEventData IJsonModel<WebBackupOperationFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebBackupOperationFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebBackupOperationFailedEventData(document.RootElement, options);
-        }
-
-        internal static WebBackupOperationFailedEventData DeserializeWebBackupOperationFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebBackupOperationFailedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebBackupOperationFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebBackupOperationFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebBackupOperationFailedEventData IPersistableModel<WebBackupOperationFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebBackupOperationFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebBackupOperationFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebBackupOperationFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebBackupOperationFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebBackupOperationFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationFailedEventData.cs
deleted file mode 100644
index fe28f8fcac62..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationFailedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.BackupOperationFailed event. </summary>
-    public partial class WebBackupOperationFailedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebBackupOperationFailedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebBackupOperationFailedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationFailedEventData"/> for deserialization. </summary>
-        internal WebBackupOperationFailedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationStartedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationStartedEventData.Serialization.cs
deleted file mode 100644
index aed7afbdc5b8..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationStartedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebBackupOperationStartedEventData : IUtf8JsonSerializable, IJsonModel<WebBackupOperationStartedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebBackupOperationStartedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebBackupOperationStartedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebBackupOperationStartedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebBackupOperationStartedEventData IJsonModel<WebBackupOperationStartedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebBackupOperationStartedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebBackupOperationStartedEventData(document.RootElement, options);
-        }
-
-        internal static WebBackupOperationStartedEventData DeserializeWebBackupOperationStartedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebBackupOperationStartedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebBackupOperationStartedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebBackupOperationStartedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebBackupOperationStartedEventData IPersistableModel<WebBackupOperationStartedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebBackupOperationStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebBackupOperationStartedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebBackupOperationStartedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebBackupOperationStartedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebBackupOperationStartedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebBackupOperationStartedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationStartedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationStartedEventData.cs
deleted file mode 100644
index de39c3343f4c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebBackupOperationStartedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.BackupOperationStarted event. </summary>
-    public partial class WebBackupOperationStartedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebBackupOperationStartedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebBackupOperationStartedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebBackupOperationStartedEventData"/> for deserialization. </summary>
-        internal WebBackupOperationStartedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationCompletedEventData.Serialization.cs
deleted file mode 100644
index f1da68ce703e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebRestoreOperationCompletedEventData : IUtf8JsonSerializable, IJsonModel<WebRestoreOperationCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebRestoreOperationCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebRestoreOperationCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebRestoreOperationCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebRestoreOperationCompletedEventData IJsonModel<WebRestoreOperationCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebRestoreOperationCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebRestoreOperationCompletedEventData(document.RootElement, options);
-        }
-
-        internal static WebRestoreOperationCompletedEventData DeserializeWebRestoreOperationCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebRestoreOperationCompletedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebRestoreOperationCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebRestoreOperationCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebRestoreOperationCompletedEventData IPersistableModel<WebRestoreOperationCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebRestoreOperationCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebRestoreOperationCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebRestoreOperationCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebRestoreOperationCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebRestoreOperationCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationCompletedEventData.cs
deleted file mode 100644
index 89117d07f272..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationCompletedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.RestoreOperationCompleted event. </summary>
-    public partial class WebRestoreOperationCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebRestoreOperationCompletedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebRestoreOperationCompletedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationCompletedEventData"/> for deserialization. </summary>
-        internal WebRestoreOperationCompletedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationFailedEventData.Serialization.cs
deleted file mode 100644
index befc7069bc90..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebRestoreOperationFailedEventData : IUtf8JsonSerializable, IJsonModel<WebRestoreOperationFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebRestoreOperationFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebRestoreOperationFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebRestoreOperationFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebRestoreOperationFailedEventData IJsonModel<WebRestoreOperationFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebRestoreOperationFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebRestoreOperationFailedEventData(document.RootElement, options);
-        }
-
-        internal static WebRestoreOperationFailedEventData DeserializeWebRestoreOperationFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebRestoreOperationFailedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebRestoreOperationFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebRestoreOperationFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebRestoreOperationFailedEventData IPersistableModel<WebRestoreOperationFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebRestoreOperationFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebRestoreOperationFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebRestoreOperationFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebRestoreOperationFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebRestoreOperationFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationFailedEventData.cs
deleted file mode 100644
index 8e5342982adf..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationFailedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.RestoreOperationFailed event. </summary>
-    public partial class WebRestoreOperationFailedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebRestoreOperationFailedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebRestoreOperationFailedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationFailedEventData"/> for deserialization. </summary>
-        internal WebRestoreOperationFailedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationStartedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationStartedEventData.Serialization.cs
deleted file mode 100644
index 736f9d2dc985..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationStartedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebRestoreOperationStartedEventData : IUtf8JsonSerializable, IJsonModel<WebRestoreOperationStartedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebRestoreOperationStartedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebRestoreOperationStartedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebRestoreOperationStartedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebRestoreOperationStartedEventData IJsonModel<WebRestoreOperationStartedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebRestoreOperationStartedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebRestoreOperationStartedEventData(document.RootElement, options);
-        }
-
-        internal static WebRestoreOperationStartedEventData DeserializeWebRestoreOperationStartedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebRestoreOperationStartedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebRestoreOperationStartedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebRestoreOperationStartedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebRestoreOperationStartedEventData IPersistableModel<WebRestoreOperationStartedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebRestoreOperationStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebRestoreOperationStartedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebRestoreOperationStartedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebRestoreOperationStartedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebRestoreOperationStartedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebRestoreOperationStartedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationStartedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationStartedEventData.cs
deleted file mode 100644
index 56a269515051..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebRestoreOperationStartedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.RestoreOperationStarted event. </summary>
-    public partial class WebRestoreOperationStartedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebRestoreOperationStartedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebRestoreOperationStartedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebRestoreOperationStartedEventData"/> for deserialization. </summary>
-        internal WebRestoreOperationStartedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapCompletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapCompletedEventData.Serialization.cs
deleted file mode 100644
index 2f3fd9f03910..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapCompletedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebSlotSwapCompletedEventData : IUtf8JsonSerializable, IJsonModel<WebSlotSwapCompletedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebSlotSwapCompletedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebSlotSwapCompletedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapCompletedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebSlotSwapCompletedEventData IJsonModel<WebSlotSwapCompletedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapCompletedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebSlotSwapCompletedEventData(document.RootElement, options);
-        }
-
-        internal static WebSlotSwapCompletedEventData DeserializeWebSlotSwapCompletedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebSlotSwapCompletedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebSlotSwapCompletedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapCompletedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebSlotSwapCompletedEventData IPersistableModel<WebSlotSwapCompletedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapCompletedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebSlotSwapCompletedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapCompletedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebSlotSwapCompletedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebSlotSwapCompletedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebSlotSwapCompletedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapCompletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapCompletedEventData.cs
deleted file mode 100644
index ef1a8a7802ed..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapCompletedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.SlotSwapCompleted event. </summary>
-    public partial class WebSlotSwapCompletedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebSlotSwapCompletedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapCompletedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebSlotSwapCompletedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapCompletedEventData"/> for deserialization. </summary>
-        internal WebSlotSwapCompletedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapFailedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapFailedEventData.Serialization.cs
deleted file mode 100644
index cc16e789939e..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapFailedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebSlotSwapFailedEventData : IUtf8JsonSerializable, IJsonModel<WebSlotSwapFailedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebSlotSwapFailedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebSlotSwapFailedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapFailedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebSlotSwapFailedEventData IJsonModel<WebSlotSwapFailedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapFailedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebSlotSwapFailedEventData(document.RootElement, options);
-        }
-
-        internal static WebSlotSwapFailedEventData DeserializeWebSlotSwapFailedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebSlotSwapFailedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebSlotSwapFailedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapFailedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebSlotSwapFailedEventData IPersistableModel<WebSlotSwapFailedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapFailedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebSlotSwapFailedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapFailedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebSlotSwapFailedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebSlotSwapFailedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebSlotSwapFailedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapFailedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapFailedEventData.cs
deleted file mode 100644
index 0ea9b65f8e11..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapFailedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.SlotSwapFailed event. </summary>
-    public partial class WebSlotSwapFailedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebSlotSwapFailedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapFailedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebSlotSwapFailedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapFailedEventData"/> for deserialization. </summary>
-        internal WebSlotSwapFailedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapStartedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapStartedEventData.Serialization.cs
deleted file mode 100644
index 89e6c83484ee..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapStartedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebSlotSwapStartedEventData : IUtf8JsonSerializable, IJsonModel<WebSlotSwapStartedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebSlotSwapStartedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebSlotSwapStartedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapStartedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebSlotSwapStartedEventData IJsonModel<WebSlotSwapStartedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapStartedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebSlotSwapStartedEventData(document.RootElement, options);
-        }
-
-        internal static WebSlotSwapStartedEventData DeserializeWebSlotSwapStartedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebSlotSwapStartedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebSlotSwapStartedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapStartedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebSlotSwapStartedEventData IPersistableModel<WebSlotSwapStartedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebSlotSwapStartedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapStartedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebSlotSwapStartedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebSlotSwapStartedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebSlotSwapStartedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapStartedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapStartedEventData.cs
deleted file mode 100644
index 14651b8d467c..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapStartedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.SlotSwapStarted event. </summary>
-    public partial class WebSlotSwapStartedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebSlotSwapStartedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebSlotSwapStartedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapStartedEventData"/> for deserialization. </summary>
-        internal WebSlotSwapStartedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewCancelledEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewCancelledEventData.Serialization.cs
deleted file mode 100644
index 448d307ecd32..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewCancelledEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebSlotSwapWithPreviewCancelledEventData : IUtf8JsonSerializable, IJsonModel<WebSlotSwapWithPreviewCancelledEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebSlotSwapWithPreviewCancelledEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebSlotSwapWithPreviewCancelledEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapWithPreviewCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapWithPreviewCancelledEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebSlotSwapWithPreviewCancelledEventData IJsonModel<WebSlotSwapWithPreviewCancelledEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapWithPreviewCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapWithPreviewCancelledEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebSlotSwapWithPreviewCancelledEventData(document.RootElement, options);
-        }
-
-        internal static WebSlotSwapWithPreviewCancelledEventData DeserializeWebSlotSwapWithPreviewCancelledEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebSlotSwapWithPreviewCancelledEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebSlotSwapWithPreviewCancelledEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapWithPreviewCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapWithPreviewCancelledEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebSlotSwapWithPreviewCancelledEventData IPersistableModel<WebSlotSwapWithPreviewCancelledEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapWithPreviewCancelledEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebSlotSwapWithPreviewCancelledEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapWithPreviewCancelledEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebSlotSwapWithPreviewCancelledEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebSlotSwapWithPreviewCancelledEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebSlotSwapWithPreviewCancelledEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewCancelledEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewCancelledEventData.cs
deleted file mode 100644
index a6d365495a26..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewCancelledEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.SlotSwapWithPreviewCancelled event. </summary>
-    public partial class WebSlotSwapWithPreviewCancelledEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapWithPreviewCancelledEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebSlotSwapWithPreviewCancelledEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapWithPreviewCancelledEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebSlotSwapWithPreviewCancelledEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapWithPreviewCancelledEventData"/> for deserialization. </summary>
-        internal WebSlotSwapWithPreviewCancelledEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewStartedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewStartedEventData.Serialization.cs
deleted file mode 100644
index 445795c243b5..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewStartedEventData.Serialization.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.Messaging.EventGrid.SystemEvents
-{
-    public partial class WebSlotSwapWithPreviewStartedEventData : IUtf8JsonSerializable, IJsonModel<WebSlotSwapWithPreviewStartedEventData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<WebSlotSwapWithPreviewStartedEventData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<WebSlotSwapWithPreviewStartedEventData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapWithPreviewStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapWithPreviewStartedEventData)} does not support writing '{format}' format.");
-            }
-
-            writer.WritePropertyName("appEventTypeDetail"u8);
-            writer.WriteObjectValue(AppEventTypeDetail, options);
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(ClientRequestId))
-            {
-                writer.WritePropertyName("clientRequestId"u8);
-                writer.WriteStringValue(ClientRequestId);
-            }
-            if (Optional.IsDefined(CorrelationRequestId))
-            {
-                writer.WritePropertyName("correlationRequestId"u8);
-                writer.WriteStringValue(CorrelationRequestId);
-            }
-            if (Optional.IsDefined(RequestId))
-            {
-                writer.WritePropertyName("requestId"u8);
-                writer.WriteStringValue(RequestId);
-            }
-            if (Optional.IsDefined(Address))
-            {
-                writer.WritePropertyName("address"u8);
-                writer.WriteStringValue(Address);
-            }
-            if (Optional.IsDefined(Verb))
-            {
-                writer.WritePropertyName("verb"u8);
-                writer.WriteStringValue(Verb);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        WebSlotSwapWithPreviewStartedEventData IJsonModel<WebSlotSwapWithPreviewStartedEventData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapWithPreviewStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(WebSlotSwapWithPreviewStartedEventData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeWebSlotSwapWithPreviewStartedEventData(document.RootElement, options);
-        }
-
-        internal static WebSlotSwapWithPreviewStartedEventData DeserializeWebSlotSwapWithPreviewStartedEventData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AppEventTypeDetail appEventTypeDetail = default;
-            string name = default;
-            string clientRequestId = default;
-            string correlationRequestId = default;
-            string requestId = default;
-            string address = default;
-            string verb = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("appEventTypeDetail"u8))
-                {
-                    appEventTypeDetail = AppEventTypeDetail.DeserializeAppEventTypeDetail(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("clientRequestId"u8))
-                {
-                    clientRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("correlationRequestId"u8))
-                {
-                    correlationRequestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("requestId"u8))
-                {
-                    requestId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("address"u8))
-                {
-                    address = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("verb"u8))
-                {
-                    verb = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new WebSlotSwapWithPreviewStartedEventData(
-                appEventTypeDetail,
-                name,
-                clientRequestId,
-                correlationRequestId,
-                requestId,
-                address,
-                verb,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<WebSlotSwapWithPreviewStartedEventData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapWithPreviewStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapWithPreviewStartedEventData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        WebSlotSwapWithPreviewStartedEventData IPersistableModel<WebSlotSwapWithPreviewStartedEventData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<WebSlotSwapWithPreviewStartedEventData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeWebSlotSwapWithPreviewStartedEventData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(WebSlotSwapWithPreviewStartedEventData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<WebSlotSwapWithPreviewStartedEventData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The response to deserialize the model from. </param>
-        internal static WebSlotSwapWithPreviewStartedEventData FromResponse(Response response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeWebSlotSwapWithPreviewStartedEventData(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
-        {
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewStartedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewStartedEventData.cs
deleted file mode 100644
index c5040a0eb438..000000000000
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/WebSlotSwapWithPreviewStartedEventData.cs
+++ /dev/null
@@ -1,99 +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.Messaging.EventGrid.SystemEvents
-{
-    /// <summary> Schema of the Data property of an EventGridEvent for a Microsoft.Web.SlotSwapWithPreviewStarted event. </summary>
-    public partial class WebSlotSwapWithPreviewStartedEventData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapWithPreviewStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="appEventTypeDetail"/> is null. </exception>
-        internal WebSlotSwapWithPreviewStartedEventData(AppEventTypeDetail appEventTypeDetail)
-        {
-            Argument.AssertNotNull(appEventTypeDetail, nameof(appEventTypeDetail));
-
-            AppEventTypeDetail = appEventTypeDetail;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapWithPreviewStartedEventData"/>. </summary>
-        /// <param name="appEventTypeDetail"> Detail of action on the app. </param>
-        /// <param name="name"> name of the web site that had this event. </param>
-        /// <param name="clientRequestId"> The client request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="correlationRequestId"> The correlation request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="requestId"> The request id generated by the app service for the site API operation that triggered this event. </param>
-        /// <param name="address"> HTTP request URL of this operation. </param>
-        /// <param name="verb"> HTTP verb of this operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal WebSlotSwapWithPreviewStartedEventData(AppEventTypeDetail appEventTypeDetail, string name, string clientRequestId, string correlationRequestId, string requestId, string address, string verb, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            AppEventTypeDetail = appEventTypeDetail;
-            Name = name;
-            ClientRequestId = clientRequestId;
-            CorrelationRequestId = correlationRequestId;
-            RequestId = requestId;
-            Address = address;
-            Verb = verb;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="WebSlotSwapWithPreviewStartedEventData"/> for deserialization. </summary>
-        internal WebSlotSwapWithPreviewStartedEventData()
-        {
-        }
-
-        /// <summary> Detail of action on the app. </summary>
-        public AppEventTypeDetail AppEventTypeDetail { get; }
-        /// <summary> name of the web site that had this event. </summary>
-        public string Name { get; }
-        /// <summary> The client request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string ClientRequestId { get; }
-        /// <summary> The correlation request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string CorrelationRequestId { get; }
-        /// <summary> The request id generated by the app service for the site API operation that triggered this event. </summary>
-        public string RequestId { get; }
-        /// <summary> HTTP request URL of this operation. </summary>
-        public string Address { get; }
-        /// <summary> HTTP verb of this operation. </summary>
-        public string Verb { get; }
-    }
-}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml
index e59d0681c201..7a3577acd9ca 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml
@@ -1,3 +1,4 @@
+directory: specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents
+commit: 90994cf250891c93b12cd0bfcd4e237e331c6341
 repo: Azure/azure-rest-api-specs
-directory: "specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents"
-commit: 9f024124361561030653abd1e8ec6d5ad1080c1a
+additionalDirectories: