diff --git a/src/AutoRest.CSharp/Common/Input/CodeModelPartials.cs b/src/AutoRest.CSharp/Common/Input/CodeModelPartials.cs
index f9934f2bae7..427330e5eba 100644
--- a/src/AutoRest.CSharp/Common/Input/CodeModelPartials.cs
+++ b/src/AutoRest.CSharp/Common/Input/CodeModelPartials.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using AutoRest.CSharp.Output.Models.Responses;
 using AutoRest.CSharp.Utilities;
 using Azure.Core;
 using YamlDotNet.Serialization;
@@ -16,6 +15,9 @@
 // ReSharper disable once CheckNamespace
 namespace AutoRest.CSharp.Input
 {
+    [DebuggerDisplay("Languages(Name: {Default.Name})")]
+    internal partial class Languages { }
+
     internal partial class Operation
     {
         // For some reason, booleans in dictionaries are deserialized as string instead of bool.
diff --git a/src/AutoRest.CSharp/Common/Output/Models/Types/TypeProvider.cs b/src/AutoRest.CSharp/Common/Output/Models/Types/TypeProvider.cs
index f78182c2eb7..0ad2f466885 100644
--- a/src/AutoRest.CSharp/Common/Output/Models/Types/TypeProvider.cs
+++ b/src/AutoRest.CSharp/Common/Output/Models/Types/TypeProvider.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Diagnostics;
 using AutoRest.CSharp.Generation.Types;
 using AutoRest.CSharp.Input;
 using AutoRest.CSharp.Input.Source;
@@ -10,6 +11,7 @@
 
 namespace AutoRest.CSharp.Output.Models.Types
 {
+    [DebuggerDisplay("Name: {Declaration.Name}, Namespace: {Declaration.Namespace}")]
     internal abstract class TypeProvider
     {
         private readonly Lazy<INamedTypeSymbol?> _existingType;
diff --git a/src/AutoRest.CSharp/LowLevel/Output/LowLevelClient.cs b/src/AutoRest.CSharp/LowLevel/Output/LowLevelClient.cs
index 638a3c20475..a36369f5223 100644
--- a/src/AutoRest.CSharp/LowLevel/Output/LowLevelClient.cs
+++ b/src/AutoRest.CSharp/LowLevel/Output/LowLevelClient.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using System.Text.RegularExpressions;
 using AutoRest.CSharp.Common.Input;
 using AutoRest.CSharp.Common.Input.Examples;
 using AutoRest.CSharp.Common.Output.Builders;
@@ -17,7 +16,6 @@
 using AutoRest.CSharp.Output.Models.Shared;
 using AutoRest.CSharp.Output.Models.Types;
 using AutoRest.CSharp.Utilities;
-using Azure.Core;
 using Microsoft.CodeAnalysis;
 using static AutoRest.CSharp.Output.Models.MethodSignatureModifiers;