diff --git a/BurnOutSharp/PackerType/ASPack.cs b/BurnOutSharp/PackerType/ASPack.cs
index a8d38152..09aa5fb4 100644
--- a/BurnOutSharp/PackerType/ASPack.cs
+++ b/BurnOutSharp/PackerType/ASPack.cs
@@ -11,9 +11,6 @@ namespace BurnOutSharp.PackerType
     // TODO: Add extraction
     public class ASPack : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/AdvancedInstaller.cs b/BurnOutSharp/PackerType/AdvancedInstaller.cs
index 5c91ca4d..0ca3b48a 100644
--- a/BurnOutSharp/PackerType/AdvancedInstaller.cs
+++ b/BurnOutSharp/PackerType/AdvancedInstaller.cs
@@ -11,9 +11,6 @@ namespace BurnOutSharp.PackerType
     // TODO: Verify that all versions are detected
     public class AdvancedInstaller : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/Armadillo.cs b/BurnOutSharp/PackerType/Armadillo.cs
index a4effae9..f4ddf120 100644
--- a/BurnOutSharp/PackerType/Armadillo.cs
+++ b/BurnOutSharp/PackerType/Armadillo.cs
@@ -13,9 +13,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class Armadillo : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/AutoPlayMediaStudio.cs b/BurnOutSharp/PackerType/AutoPlayMediaStudio.cs
index 7f655e94..2d8aa596 100644
--- a/BurnOutSharp/PackerType/AutoPlayMediaStudio.cs
+++ b/BurnOutSharp/PackerType/AutoPlayMediaStudio.cs
@@ -12,9 +12,6 @@ namespace BurnOutSharp.PackerType
     // TODO: Add extraction
     public class AutoPlayMediaStudio : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/CExe.cs b/BurnOutSharp/PackerType/CExe.cs
index 20e156d2..c89cd634 100644
--- a/BurnOutSharp/PackerType/CExe.cs
+++ b/BurnOutSharp/PackerType/CExe.cs
@@ -13,9 +13,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class CExe : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-        
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/EXEStealth.cs b/BurnOutSharp/PackerType/EXEStealth.cs
index 3fa2284c..7f20b5ef 100644
--- a/BurnOutSharp/PackerType/EXEStealth.cs
+++ b/BurnOutSharp/PackerType/EXEStealth.cs
@@ -13,9 +13,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class EXEStealth : IContentCheck, IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckContents(string file, byte[] fileContent, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/GenteeInstaller.cs b/BurnOutSharp/PackerType/GenteeInstaller.cs
index bd7cce79..7653f3c5 100644
--- a/BurnOutSharp/PackerType/GenteeInstaller.cs
+++ b/BurnOutSharp/PackerType/GenteeInstaller.cs
@@ -11,9 +11,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class GenteeInstaller : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/InnoSetup.cs b/BurnOutSharp/PackerType/InnoSetup.cs
index a93d0601..b7d0b63f 100644
--- a/BurnOutSharp/PackerType/InnoSetup.cs
+++ b/BurnOutSharp/PackerType/InnoSetup.cs
@@ -14,9 +14,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class InnoSetup : INewExecutableCheck, IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckNewExecutable(string file, NewExecutable nex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/InstallAnywhere.cs b/BurnOutSharp/PackerType/InstallAnywhere.cs
index 2746c9c5..e79878bf 100644
--- a/BurnOutSharp/PackerType/InstallAnywhere.cs
+++ b/BurnOutSharp/PackerType/InstallAnywhere.cs
@@ -11,9 +11,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class InstallAnywhere : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/InstallerVISE.cs b/BurnOutSharp/PackerType/InstallerVISE.cs
index bf3af477..b206841c 100644
--- a/BurnOutSharp/PackerType/InstallerVISE.cs
+++ b/BurnOutSharp/PackerType/InstallerVISE.cs
@@ -11,9 +11,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class InstallerVISE : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         //TODO: Add exact version detection for Windows builds, make sure versions before 3.X are detected as well, and detect the Mac builds.
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
diff --git a/BurnOutSharp/PackerType/IntelInstallationFramework.cs b/BurnOutSharp/PackerType/IntelInstallationFramework.cs
index db881bef..30106cc7 100644
--- a/BurnOutSharp/PackerType/IntelInstallationFramework.cs
+++ b/BurnOutSharp/PackerType/IntelInstallationFramework.cs
@@ -10,9 +10,6 @@ namespace BurnOutSharp.PackerType
     // TODO: Add extraction, seems to primarily use MSZip compression.
     public class IntelInstallationFramework : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/MicrosoftCABSFX.cs b/BurnOutSharp/PackerType/MicrosoftCABSFX.cs
index 7b90ef93..fa5cbf33 100644
--- a/BurnOutSharp/PackerType/MicrosoftCABSFX.cs
+++ b/BurnOutSharp/PackerType/MicrosoftCABSFX.cs
@@ -13,9 +13,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class MicrosoftCABSFX : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/NSIS.cs b/BurnOutSharp/PackerType/NSIS.cs
index 01ad520b..9c189ffc 100644
--- a/BurnOutSharp/PackerType/NSIS.cs
+++ b/BurnOutSharp/PackerType/NSIS.cs
@@ -10,9 +10,6 @@ namespace BurnOutSharp.PackerType
     // TODO: Add extraction
     public class NSIS : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/PECompact.cs b/BurnOutSharp/PackerType/PECompact.cs
index 2ebc81a0..7b5fdc6a 100644
--- a/BurnOutSharp/PackerType/PECompact.cs
+++ b/BurnOutSharp/PackerType/PECompact.cs
@@ -9,9 +9,6 @@ namespace BurnOutSharp.PackerType
     // TODO: Add extraction
     public class PECompact : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/Petite.cs b/BurnOutSharp/PackerType/Petite.cs
index 9f56d994..c6d3694b 100644
--- a/BurnOutSharp/PackerType/Petite.cs
+++ b/BurnOutSharp/PackerType/Petite.cs
@@ -9,9 +9,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class PEtite : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/SetupFactory.cs b/BurnOutSharp/PackerType/SetupFactory.cs
index c99365c9..f5f901a2 100644
--- a/BurnOutSharp/PackerType/SetupFactory.cs
+++ b/BurnOutSharp/PackerType/SetupFactory.cs
@@ -12,9 +12,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class SetupFactory : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/Shrinker.cs b/BurnOutSharp/PackerType/Shrinker.cs
index 9add60ff..af707c28 100644
--- a/BurnOutSharp/PackerType/Shrinker.cs
+++ b/BurnOutSharp/PackerType/Shrinker.cs
@@ -9,9 +9,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class Shrinker : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/UPX.cs b/BurnOutSharp/PackerType/UPX.cs
index 7312d418..2f6c53e1 100644
--- a/BurnOutSharp/PackerType/UPX.cs
+++ b/BurnOutSharp/PackerType/UPX.cs
@@ -12,9 +12,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class UPX : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/WinRARSFX.cs b/BurnOutSharp/PackerType/WinRARSFX.cs
index 5fb0045a..f4b9adad 100644
--- a/BurnOutSharp/PackerType/WinRARSFX.cs
+++ b/BurnOutSharp/PackerType/WinRARSFX.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using BurnOutSharp.Interfaces;
-using BurnOutSharp.Matching;
 using BurnOutSharp.Tools;
 using BurnOutSharp.Wrappers;
 using SharpCompress.Archives;
@@ -14,9 +12,6 @@ namespace BurnOutSharp.PackerType
 {
     public class WinRARSFX : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/WinZipSFX.cs b/BurnOutSharp/PackerType/WinZipSFX.cs
index 053d16a1..291dffc0 100644
--- a/BurnOutSharp/PackerType/WinZipSFX.cs
+++ b/BurnOutSharp/PackerType/WinZipSFX.cs
@@ -13,9 +13,6 @@ namespace BurnOutSharp.PackerType
 {
     public class WinZipSFX : INewExecutableCheck, IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckNewExecutable(string file, NewExecutable nex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/WiseInstaller.cs b/BurnOutSharp/PackerType/WiseInstaller.cs
index 1d75f09b..50f10a6e 100644
--- a/BurnOutSharp/PackerType/WiseInstaller.cs
+++ b/BurnOutSharp/PackerType/WiseInstaller.cs
@@ -13,9 +13,6 @@ namespace BurnOutSharp.PackerType
     // https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
     public class WiseInstaller : INewExecutableCheck, IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckNewExecutable(string file, NewExecutable nex, bool includeDebug)
         {
diff --git a/BurnOutSharp/PackerType/dotFuscator.cs b/BurnOutSharp/PackerType/dotFuscator.cs
index beaf7dd0..7febc04d 100644
--- a/BurnOutSharp/PackerType/dotFuscator.cs
+++ b/BurnOutSharp/PackerType/dotFuscator.cs
@@ -10,9 +10,6 @@ namespace BurnOutSharp.PackerType
     // TODO: Add extraction
     public class dotFuscator : IPortableExecutableCheck, IScannable
     {
-        /// <inheritdoc/>
-        public bool ShouldScan(byte[] magic) => true;
-
         /// <inheritdoc/>
         public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {