diff --git a/src/LibHac/Bcat/Digest.cs b/src/LibHac/Bcat/Digest.cs
index 108ef0aa..b4f23f23 100644
--- a/src/LibHac/Bcat/Digest.cs
+++ b/src/LibHac/Bcat/Digest.cs
@@ -1,10 +1,8 @@
-using System.Diagnostics;
-using LibHac.Common.FixedArrays;
+using LibHac.Common.FixedArrays;
 using LibHac.Util;
 
 namespace LibHac.Bcat;
 
-[DebuggerDisplay("{ToString()}")]
 public struct Digest
 {
     public Array16<byte> Value;
diff --git a/src/LibHac/Bcat/DirectoryName.cs b/src/LibHac/Bcat/DirectoryName.cs
index 990daeeb..5d0ad5c9 100644
--- a/src/LibHac/Bcat/DirectoryName.cs
+++ b/src/LibHac/Bcat/DirectoryName.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using LibHac.Common.FixedArrays;
 using LibHac.Util;
 
 namespace LibHac.Bcat;
 
-[DebuggerDisplay("{ToString()}")]
 public struct DirectoryName
 {
     private const int MaxSize = 0x20;
diff --git a/src/LibHac/Bcat/FileName.cs b/src/LibHac/Bcat/FileName.cs
index 3c35004f..0fbfac18 100644
--- a/src/LibHac/Bcat/FileName.cs
+++ b/src/LibHac/Bcat/FileName.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using LibHac.Common.FixedArrays;
 using LibHac.Util;
 
 namespace LibHac.Bcat;
 
-[DebuggerDisplay("{ToString()}")]
 public struct FileName
 {
     private const int MaxSize = 0x20;
diff --git a/src/LibHac/Common/Buffer.cs b/src/LibHac/Common/Buffer.cs
index 7f3846f4..cfaf233a 100644
--- a/src/LibHac/Common/Buffer.cs
+++ b/src/LibHac/Common/Buffer.cs
@@ -10,7 +10,6 @@ namespace LibHac.Common;
 /// Represents a buffer of 16 bytes.
 /// Contains functions that assist with common operations on small buffers.
 /// </summary>
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 16)]
 public struct Buffer16
 {
@@ -67,7 +66,6 @@ public struct Buffer16
     }
 }
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 32)]
 public struct Buffer32
 {
@@ -124,4 +122,4 @@ public struct Buffer32
     {
         return Bytes.ToHexString();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Common/Id128.cs b/src/LibHac/Common/Id128.cs
index e470d6b0..75a36e0f 100644
--- a/src/LibHac/Common/Id128.cs
+++ b/src/LibHac/Common/Id128.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Util;
 
@@ -8,7 +7,6 @@ namespace LibHac.Common;
 /// <summary>
 /// A generic 128-bit ID value.
 /// </summary>
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 0x10)]
 public struct Id128 : IEquatable<Id128>, IComparable<Id128>, IComparable
 {
@@ -81,4 +79,4 @@ public struct Id128 : IEquatable<Id128>, IComparable<Id128>, IComparable
     public static bool operator >(Id128 left, Id128 right) => left.CompareTo(right) > 0;
     public static bool operator <=(Id128 left, Id128 right) => left.CompareTo(right) <= 0;
     public static bool operator >=(Id128 left, Id128 right) => left.CompareTo(right) >= 0;
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Common/Key128.cs b/src/LibHac/Common/Key128.cs
index ebc6682e..f1171c2c 100644
--- a/src/LibHac/Common/Key128.cs
+++ b/src/LibHac/Common/Key128.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Util;
 
 namespace LibHac.Common;
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 0x10)]
 public struct Key128 : IEquatable<Key128>
 {
@@ -42,4 +40,4 @@ public struct Key128 : IEquatable<Key128>
 
     public static bool operator ==(Key128 left, Key128 right) => left.Equals(right);
     public static bool operator !=(Key128 left, Key128 right) => !(left == right);
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Common/U8Span.cs b/src/LibHac/Common/U8Span.cs
index dac9b2c5..c5758105 100644
--- a/src/LibHac/Common/U8Span.cs
+++ b/src/LibHac/Common/U8Span.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -7,7 +6,6 @@ using LibHac.Util;
 
 namespace LibHac.Common;
 
-[DebuggerDisplay("{ToString()}")]
 public readonly ref struct U8Span
 {
     private readonly ReadOnlySpan<byte> _buffer;
@@ -51,7 +49,7 @@ public readonly ref struct U8Span
 #if DEBUG
         return _buffer[i];
 #else
-            return Unsafe.Add(ref MemoryMarshal.GetReference(_buffer), i);
+        return Unsafe.Add(ref MemoryMarshal.GetReference(_buffer), i);
 #endif
     }
 
@@ -99,4 +97,4 @@ public readonly ref struct U8Span
     /// <returns><see langword="true"/> if the span has no buffer or begins with a null terminator.
     /// Otherwise, <see langword="false"/>.</returns>
     public bool IsEmpty() => _buffer.IsEmpty || MemoryMarshal.GetReference(_buffer) == 0;
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Common/U8SpanMutable.cs b/src/LibHac/Common/U8SpanMutable.cs
index 1dd1629e..e3ad7938 100644
--- a/src/LibHac/Common/U8SpanMutable.cs
+++ b/src/LibHac/Common/U8SpanMutable.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -7,7 +6,6 @@ using LibHac.Util;
 
 namespace LibHac.Common;
 
-[DebuggerDisplay("{ToString()}")]
 public readonly ref struct U8SpanMutable
 {
     private readonly Span<byte> _buffer;
@@ -50,7 +48,7 @@ public readonly ref struct U8SpanMutable
 #if DEBUG
         return _buffer[i];
 #else
-            return Unsafe.Add(ref MemoryMarshal.GetReference(_buffer), i);
+        return Unsafe.Add(ref MemoryMarshal.GetReference(_buffer), i);
 #endif
     }
 
@@ -95,4 +93,4 @@ public readonly ref struct U8SpanMutable
     /// <returns><see langword="true"/> if the span has no buffer or begins with a null terminator.
     /// Otherwise, <see langword="false"/>.</returns>
     public bool IsEmpty() => _buffer.IsEmpty || MemoryMarshal.GetReference(_buffer) == 0;
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Common/U8String.cs b/src/LibHac/Common/U8String.cs
index dbdbae0b..10fc22a1 100644
--- a/src/LibHac/Common/U8String.cs
+++ b/src/LibHac/Common/U8String.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Text;
 using LibHac.Util;
 
 namespace LibHac.Common;
 
-[DebuggerDisplay("{ToString()}")]
 public readonly struct U8String
 {
     private readonly byte[] _buffer;
@@ -60,4 +58,4 @@ public readonly struct U8String
     /// <returns><see langword="true"/> if the string has no buffer or begins with a null terminator.
     /// Otherwise, <see langword="false"/>.</returns>
     public bool IsEmpty() => _buffer == null || _buffer.Length < 1 || _buffer[0] == 0;
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Common/U8StringBuilder.cs b/src/LibHac/Common/U8StringBuilder.cs
index 300afa94..73b8bd23 100644
--- a/src/LibHac/Common/U8StringBuilder.cs
+++ b/src/LibHac/Common/U8StringBuilder.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Buffers;
 using System.Buffers.Text;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using LibHac.Diag;
 using LibHac.Util;
 
 namespace LibHac.Common;
 
-[DebuggerDisplay("{ToString()}")]
 public ref struct U8StringBuilder
 {
     private const int NullTerminatorLength = 1;
diff --git a/src/LibHac/Common/U8StringMutable.cs b/src/LibHac/Common/U8StringMutable.cs
index dd76847e..38f2abca 100644
--- a/src/LibHac/Common/U8StringMutable.cs
+++ b/src/LibHac/Common/U8StringMutable.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Text;
 using LibHac.Util;
 
 namespace LibHac.Common;
 
-[DebuggerDisplay("{ToString()}")]
 public readonly struct U8StringMutable
 {
     private readonly byte[] _buffer;
@@ -67,4 +65,4 @@ public readonly struct U8StringMutable
     /// <returns><see langword="true"/> if the string has no buffer or begins with a null terminator.
     /// Otherwise, <see langword="false"/>.</returns>
     public bool IsEmpty() => _buffer == null || _buffer.Length < 1 || _buffer[0] == 0;
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Crypto/KeyTypes.cs b/src/LibHac/Crypto/KeyTypes.cs
index 01f38993..32c9817f 100644
--- a/src/LibHac/Crypto/KeyTypes.cs
+++ b/src/LibHac/Crypto/KeyTypes.cs
@@ -8,7 +8,6 @@ using LibHac.Util;
 
 namespace LibHac.Crypto;
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Explicit, Size = Size)]
 public struct AesKey
 {
@@ -36,7 +35,6 @@ public struct AesKey
 #endif
 }
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Explicit, Size = Size)]
 public struct AesXtsKey
 {
@@ -64,7 +62,6 @@ public struct AesXtsKey
     public readonly override string ToString() => DataRo.ToHexString();
 }
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Explicit, Size = Size)]
 public struct AesIv
 {
@@ -91,7 +88,6 @@ public struct AesIv
 #endif
 }
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Explicit, Size = Size)]
 public struct AesCmac
 {
diff --git a/src/LibHac/Fs/EncryptionSeed.cs b/src/LibHac/Fs/EncryptionSeed.cs
index 619abda7..8d5601e1 100644
--- a/src/LibHac/Fs/EncryptionSeed.cs
+++ b/src/LibHac/Fs/EncryptionSeed.cs
@@ -1,10 +1,8 @@
-using System.Diagnostics;
-using LibHac.Common.FixedArrays;
+using LibHac.Common.FixedArrays;
 using LibHac.Util;
 
 namespace LibHac.Fs;
 
-[DebuggerDisplay("{ToString()}")]
 public struct EncryptionSeed
 {
     public Array16<byte> Value;
diff --git a/src/LibHac/Fs/MountName.cs b/src/LibHac/Fs/MountName.cs
index 52ca771c..152dfb41 100644
--- a/src/LibHac/Fs/MountName.cs
+++ b/src/LibHac/Fs/MountName.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using LibHac.Common;
 using LibHac.Common.FixedArrays;
 
 namespace LibHac.Fs;
 
-[DebuggerDisplay("{ToString()}")]
 internal struct MountName
 {
     private Array16<byte> _nameArray;
diff --git a/src/LibHac/FsSrv/Sf/FspPath.cs b/src/LibHac/FsSrv/Sf/FspPath.cs
index 862b2620..9fdc4fd4 100644
--- a/src/LibHac/FsSrv/Sf/FspPath.cs
+++ b/src/LibHac/FsSrv/Sf/FspPath.cs
@@ -8,7 +8,6 @@ using LibHac.Util;
 
 namespace LibHac.FsSrv.Sf;
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = MaxLength + 1)]
 public readonly struct FspPath
 {
@@ -48,4 +47,4 @@ public readonly struct FspPath
     public static implicit operator U8Span(in FspPath value) => new U8Span(SpanHelpers.AsReadOnlyByteSpan(in value));
 
     public override string ToString() => StringUtils.Utf8ZToString(Str);
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/FsSystem/FsPath.cs b/src/LibHac/FsSystem/FsPath.cs
index 3d6434a6..8bc24c03 100644
--- a/src/LibHac/FsSystem/FsPath.cs
+++ b/src/LibHac/FsSystem/FsPath.cs
@@ -8,7 +8,6 @@ using LibHac.Util;
 
 namespace LibHac.FsSystem;
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = MaxLength + 1)]
 public struct FsPath
 {
@@ -40,4 +39,4 @@ public struct FsPath
     public static implicit operator U8Span(in FsPath value) => new U8Span(SpanHelpers.AsReadOnlyByteSpan(in value));
 
     public override string ToString() => StringUtils.Utf8ZToString(Str);
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Lr/Path.cs b/src/LibHac/Lr/Path.cs
index 495f8be3..444b6056 100644
--- a/src/LibHac/Lr/Path.cs
+++ b/src/LibHac/Lr/Path.cs
@@ -8,7 +8,6 @@ using LibHac.Util;
 
 namespace LibHac.Lr;
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = PathTool.EntryNameLengthMax)]
 public struct Path
 {
diff --git a/src/LibHac/Ncm/ContentId.cs b/src/LibHac/Ncm/ContentId.cs
index 1cfb93b4..f2a03564 100644
--- a/src/LibHac/Ncm/ContentId.cs
+++ b/src/LibHac/Ncm/ContentId.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Common;
 
 namespace LibHac.Ncm;
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 0x10)]
 public struct ContentId : IEquatable<ContentId>, IComparable<ContentId>, IComparable
 {
@@ -50,4 +48,4 @@ public struct ContentId : IEquatable<ContentId>, IComparable<ContentId>, ICompar
     public static bool operator >(ContentId left, ContentId right) => left.CompareTo(right) > 0;
     public static bool operator <=(ContentId left, ContentId right) => left.CompareTo(right) <= 0;
     public static bool operator >=(ContentId left, ContentId right) => left.CompareTo(right) >= 0;
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Ncm/PlaceHolderId.cs b/src/LibHac/Ncm/PlaceHolderId.cs
index f0aac726..0a49f4c6 100644
--- a/src/LibHac/Ncm/PlaceHolderId.cs
+++ b/src/LibHac/Ncm/PlaceHolderId.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Common;
 
 namespace LibHac.Ncm;
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 0x10)]
 public struct PlaceHolderId : IEquatable<PlaceHolderId>, IComparable<PlaceHolderId>, IComparable
 {
@@ -50,4 +48,4 @@ public struct PlaceHolderId : IEquatable<PlaceHolderId>, IComparable<PlaceHolder
     public static bool operator >(PlaceHolderId left, PlaceHolderId right) => left.CompareTo(right) > 0;
     public static bool operator <=(PlaceHolderId left, PlaceHolderId right) => left.CompareTo(right) <= 0;
     public static bool operator >=(PlaceHolderId left, PlaceHolderId right) => left.CompareTo(right) >= 0;
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Sm/ServiceName.cs b/src/LibHac/Sm/ServiceName.cs
index a5baf17f..5b0c99a0 100644
--- a/src/LibHac/Sm/ServiceName.cs
+++ b/src/LibHac/Sm/ServiceName.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using LibHac.Common;
 using LibHac.Util;
 
 namespace LibHac.Sm;
 
-[DebuggerDisplay("{ToString()}")]
 public readonly struct ServiceName : IEquatable<ServiceName>
 {
     private const int MaxLength = 8;
@@ -40,4 +38,4 @@ public readonly struct ServiceName : IEquatable<ServiceName>
         ulong name = Name;
         return StringUtils.Utf8ZToString(SpanHelpers.AsReadOnlyByteSpan(in name));
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Spl/AccessKey.cs b/src/LibHac/Spl/AccessKey.cs
index e8cb0772..33586fd1 100644
--- a/src/LibHac/Spl/AccessKey.cs
+++ b/src/LibHac/Spl/AccessKey.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Common;
 
 namespace LibHac.Spl;
 
-[DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 0x10)]
 public struct AccessKey : IEquatable<AccessKey>
 {
@@ -25,4 +23,4 @@ public struct AccessKey : IEquatable<AccessKey>
     public override int GetHashCode() => Key.GetHashCode();
     public static bool operator ==(AccessKey left, AccessKey right) => left.Equals(right);
     public static bool operator !=(AccessKey left, AccessKey right) => !(left == right);
-}
+}
\ No newline at end of file