diff --git a/PKHeX.Core/Saves/Blocks/BlockInfo3DS.cs b/PKHeX.Core/Saves/Blocks/BlockInfo3DS.cs
index b900d43b3..cf2c51556 100644
--- a/PKHeX.Core/Saves/Blocks/BlockInfo3DS.cs
+++ b/PKHeX.Core/Saves/Blocks/BlockInfo3DS.cs
@@ -64,35 +64,4 @@ public sealed class BlockInfo7b : BlockInfo3DS
         public BlockInfo7b(int bo, uint id, int ofs, int len) : base(bo, id, ofs, len) { }
         protected override ushort GetChecksum(byte[] data) => Checksums.CRC16NoInvert(new ReadOnlySpan<byte>(data, Offset, Length));
     }
-
-    public static class BlockInfoBEEFUtil
-    {
-        /// <summary>
-        /// Gets the <see cref="BlockInfo"/> for the input <see cref="data"/>.
-        /// </summary>
-        /// <param name="data">Complete data array</param>
-        /// <param name="blockInfoOffset">Offset the <see cref="BlockInfo"/> starts at.</param>
-        public static void DumpComputedBlockInfo(byte[] data, int blockInfoOffset)
-        {
-            blockInfoOffset += 0x14;
-
-            uint CurrentPosition = 0;
-            for (int i = 0;; i++)
-            {
-                int ofs = blockInfoOffset + (i * 8);
-
-                var Offset = CurrentPosition;
-                var Length = BitConverter.ToUInt32(data, ofs + 0);
-                if (Length == 0)
-                    break;
-                var ID = BitConverter.ToUInt16(data, ofs + 4);
-                // var Checksum = BitConverter.ToUInt16(data, ofs + 6);
-                Console.WriteLine($"ID={ID}, Offset=0x{Offset:X5}, Length=0x{Length:X5}");
-
-                // Expand out to nearest 0x200
-                var remainder = Length & 0x1FF;
-                CurrentPosition += remainder == 0 ? Length : Length + 0x200 - remainder;
-            }
-        }
-    }
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Saves/Substructures/Gen6/SecretBase/SecretBase6.cs b/PKHeX.Core/Saves/Substructures/Gen6/SecretBase/SecretBase6.cs
index 93d0dbfc7..bdb330934 100644
--- a/PKHeX.Core/Saves/Substructures/Gen6/SecretBase/SecretBase6.cs
+++ b/PKHeX.Core/Saves/Substructures/Gen6/SecretBase/SecretBase6.cs
@@ -147,7 +147,7 @@ public void Load(SecretBase6 other)
         {
             return data.Length switch
             {
-                SecretBase6.SIZE => new SecretBase6(data),
+                SIZE => new SecretBase6(data),
                 SecretBase6Other.SIZE => new SecretBase6Other(data),
                 _ => null,
             };
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/GameTime8.cs b/PKHeX.Core/Saves/Substructures/Gen8/GameTime8.cs
deleted file mode 100644
index d2488aedc..000000000
--- a/PKHeX.Core/Saves/Substructures/Gen8/GameTime8.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace PKHeX.Core
-{
-    public sealed class GameTime8 : SaveBlock
-    {
-        public GameTime8(SaveFile sav, int offset) : base(sav) => Offset = offset;
-        public uint SecondsToStart { get => BitConverter.ToUInt32(Data, 0x28); set => BitConverter.GetBytes(value).CopyTo(Data, 0x28); }
-        public uint SecondsToFame { get => BitConverter.ToUInt32(Data, 0x30); set => BitConverter.GetBytes(value).CopyTo(Data, 0x30); }
-    }
-}
\ No newline at end of file
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Situation8.cs b/PKHeX.Core/Saves/Substructures/Gen8/Situation8.cs
deleted file mode 100644
index e8662b9bc..000000000
--- a/PKHeX.Core/Saves/Substructures/Gen8/Situation8.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace PKHeX.Core
-{
-    public sealed class Situation8 : SaveBlock
-    {
-        public Situation8(SAV8SWSH sav, SCBlock block) : base(sav, block.Data) { }
-
-        // "StartLocation"
-        public int M { get => BitConverter.ToUInt16(Data, Offset + 0x00); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x00); }
-        public float X { get => BitConverter.ToSingle(Data, Offset + 0x08); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x08); }
-        public float Z { get => BitConverter.ToSingle(Data, Offset + 0x10); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x10); }
-        public float Y { get => (int)BitConverter.ToSingle(Data, Offset + 0x18); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x18); }
-        public float R { get => (int)BitConverter.ToSingle(Data, Offset + 0x20); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x20); }
-    }
-}
diff --git a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs
index d5092cfb1..b8a50fa4e 100644
--- a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs	
+++ b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs	
@@ -100,7 +100,7 @@ private void LoadFields()
 
             GB_M_OT.Enabled = GB_M_CT.Enabled = GB_Residence.Enabled =
             BTN_Save.Enabled = M_Fullness.Enabled = M_Enjoyment.Enabled =
-            L_Sociability.Enabled = MT_Sociability.Enabled = 
+            L_Sociability.Enabled = MT_Sociability.Enabled =
             L_Fullness.Enabled = L_Enjoyment.Enabled = !pkm.IsEgg;
 
             if (!pkm.IsEgg)