diff --git a/specification/eventgrid/Azure.Messaging.EventGrid/client.tsp b/specification/eventgrid/Azure.Messaging.EventGrid/client.tsp
new file mode 100644
index 000000000000..78097ec2e6b6
--- /dev/null
+++ b/specification/eventgrid/Azure.Messaging.EventGrid/client.tsp
@@ -0,0 +1,10 @@
+import "@azure-tools/typespec-client-generator-core";
+import "./main.tsp";
+
+using Azure.ClientGenerator.Core;
+
+@@internal(Azure.Messaging.EventGrid.CloudEventEvent);
+@@internal(Azure.Messaging.EventGrid.ReceiveDetails);
+@@internal(Azure.Messaging.EventGrid.PublishBatchOfCloudEvents);
+@@internal(Azure.Messaging.EventGrid.PublishCloudEvent);
+@@internal(Azure.Messaging.EventGrid.ReceiveBatchOfCloudEvents);
diff --git a/specification/eventgrid/Azure.Messaging.EventGrid/main.tsp b/specification/eventgrid/Azure.Messaging.EventGrid/main.tsp
index c641d6a8b303..d2f8d0b197e9 100644
--- a/specification/eventgrid/Azure.Messaging.EventGrid/main.tsp
+++ b/specification/eventgrid/Azure.Messaging.EventGrid/main.tsp
@@ -3,7 +3,6 @@ import "@typespec/rest";
 import "@typespec/versioning";
 import "@azure-tools/typespec-autorest";
 import "@azure-tools/typespec-azure-core";
-import "@azure-tools/typespec-client-generator-core";
 
 enum ServiceApiVersions {
   v2023_06_01_preview: "2023-06-01-preview"
@@ -48,10 +47,8 @@ namespace Azure.Messaging.EventGrid {
   using TypeSpec.Versioning;
   using Azure.Core;
   using Azure.Core.Foundations;
-  using Azure.ClientGenerator.Core;
 
   @doc("Properties of an event published to an Azure Messaging EventGrid Namespace topic using the CloudEvent 1.0 Schema.")
-  @internal
   model CloudEventEvent {
     @doc("An identifier for the event. The combination of id and source must be unique for each distinct event.")
     id: string;
@@ -97,7 +94,6 @@ namespace Azure.Messaging.EventGrid {
   }
 
   @doc("Receive operation details per Cloud Event.")
-  @internal 
   model ReceiveDetails {
     @doc("The Event Broker details.")
     brokerProperties: BrokerProperties;
@@ -143,7 +139,6 @@ namespace Azure.Messaging.EventGrid {
 
   @doc("Publish Single Cloud Event to namespace topic.")
   @route("/topics/{topicName}:publish", {shared: true})
-  @internal
   @post op PublishCloudEvent is Azure.Core.RpcOperation<{
     @doc("content type")
     @header("content-type")
@@ -161,7 +156,6 @@ namespace Azure.Messaging.EventGrid {
 
   @doc("Publish Batch of Cloud Events to namespace topic.")
   @route("/topics/{topicName}:publish", {shared: true})
-  @internal
   @post op PublishBatchOfCloudEvents is Azure.Core.RpcOperation<{
     @doc("content type")
     @header("content-type")
@@ -178,7 +172,6 @@ namespace Azure.Messaging.EventGrid {
    
   @doc("Receive Batch of Cloud Events from the Event Subscription.")
   @route("/topics/{topicName}/eventsubscriptions/{eventSubscriptionName}:receive")
-  @internal
   @post op ReceiveBatchOfCloudEvents is Azure.Core.RpcOperation<{
     @doc("Topic Name.")
     @path