Move more things in removal region for CFB

Author: mnadareski

BinaryObjectScanner/FileType/CFB.cs

@@ -43,6 +43,8 @@ public bool Extract(Stream? stream, string file, string outDir, bool includeDebu
             return true;
         }
 
+        #region REMOVE WHEN SERIALIZATION UPDATED
+
         /// <summary>
         /// Extract all files from the CFB to an output directory
         /// </summary>
@@ -169,7 +171,6 @@ private static bool ExtractEntry(SabreTools.Serialization.Wrappers.CFB cfb, int
         }
 
         /// <remarks>Adapted from LibMSI</remarks>
-        /// TODO: Remove when serialization updated
         private static string? DecodeStreamName(string input)
         {
             if (input == null)
@@ -219,7 +220,6 @@ private static bool ExtractEntry(SabreTools.Serialization.Wrappers.CFB cfb, int
         }
 
         /// <remarks>Adapted from LibMSI</remarks>
-        /// TODO: Remove when serialization updated
         private static int Mime2Utf(int x)
         {
             if (x < 10)
@@ -233,8 +233,6 @@ private static int Mime2Utf(int x)
             return '_';
         }
 
-        #region REMOVE WHEN SERIALIZATION UPDATED
-
         /// <inheritdoc/>
         private static Binary? Deserialize(Stream? data)
         {