diff --git a/TDESDUKPTTool/key.ico b/TDESDUKPTTool/Images/key.ico
similarity index 100%
rename from TDESDUKPTTool/key.ico
rename to TDESDUKPTTool/Images/key.ico
diff --git a/TDESDUKPTTool/TDESDUKPTTool.csproj b/TDESDUKPTTool/TDESDUKPTTool.csproj
index f642865..658102d 100644
--- a/TDESDUKPTTool/TDESDUKPTTool.csproj
+++ b/TDESDUKPTTool/TDESDUKPTTool.csproj
@@ -55,7 +55,7 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>key.ico</ApplicationIcon>
+    <ApplicationIcon>Images\key.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DUKPTCore, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -86,7 +86,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Utils\CryptoUtils.cs" />
     <Compile Include="Extensions\FormExtensions.cs" />
     <Compile Include="Forms\frmKeyPartTool.cs">
       <SubType>Form</SubType>
@@ -135,7 +134,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Images\warning.png" />
-    <Content Include="key.ico" />
+    <Content Include="Images\key.ico" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
diff --git a/TDESDUKPTTool/Utils/CryptoUtils.cs b/TDESDUKPTTool/Utils/CryptoUtils.cs
deleted file mode 100644
index 3ec6627..0000000
--- a/TDESDUKPTTool/Utils/CryptoUtils.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Cryptography;
-
-namespace TDESDUKPTTool.Utils
-{
-    public static class CryptoUtils
-    {
-
-        /// <summary>
-        /// Gets the next multiple of 8 
-        /// Works with both scenarios, getting 7 bytes instead of 8 and works when expecting 16 bytes and getting 15.
-        /// </summary>
-        private static int GetNearestWholeMultiple(decimal input, int multiple)
-        {
-            var output = Math.Round(input / multiple);
-            if (output == 0 && input > 0) output += 1;
-            output *= multiple;
-            return (int)output;
-        }
-
-        /// <summary>
-        /// Get first 6 characters of X9.24 check value 
-        /// </summary>
-        /// <param name="keyPart">Key Part Byte Array</param>
-        /// <returns>Key part check value</returns>
-        public static byte[] CalculateCheckValue(byte[] keyPart)
-        {
-            byte[] fullCheckData = CalculateCheckData(keyPart);
-            if (fullCheckData == null)
-                return null;
-            byte[] checkData = new byte[3];
-            Buffer.BlockCopy(fullCheckData, 0, checkData, 0, 3);
-            return checkData;
-        }
-
-        /// <summary>
-        /// Calculate Entire x9.24 Check Value for Key Part
-        /// </summary>
-        /// <param name="keyPartBytes">Key Part Byte Array</param>
-        /// <returns>Entire key part check value array</returns>
-        public static byte[] CalculateCheckData(byte[] keyPartBytes)
-        {
-            try
-            {
-
-                byte[] message = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-                using (var cipher = SymmetricAlgorithm.Create("TripleDES"))
-                {
-                    var k = keyPartBytes;
-                    cipher.Key = new byte[Math.Max(0, GetNearestWholeMultiple(k.Length, 8) - k.Length)].Concat(keyPartBytes).ToArray();
-                    cipher.IV = new byte[8];
-                    cipher.Mode = CipherMode.ECB;
-                    cipher.Padding = PaddingMode.Zeros;
-                    using (var crypto = cipher.CreateEncryptor())
-                    {
-                        var data = message;
-                        data = new byte[Math.Max(0, GetNearestWholeMultiple(data.Length, 8) - data.Length)].Concat(message).ToArray();
-                        return crypto.TransformFinalBlock(data, 0, data.Length);
-                    }
-                }
-            }
-            catch
-            {
-                return null;
-            }
-        }
-        
-    }
-}