diff --git a/ReCodeItCLI/ReCodeItCLI.csproj b/ReCodeItCLI/ReCodeItCLI.csproj
index 311345e..6fd71bd 100644
--- a/ReCodeItCLI/ReCodeItCLI.csproj
+++ b/ReCodeItCLI/ReCodeItCLI.csproj
@@ -26,6 +26,10 @@
     <Output TaskParameter="OutputItems" ItemName="OutputPath" />
   </Target>
   
+  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+    <RemoveDir Directories="$(SolutionDir)Build\**\*.*" />
+  </Target>
+  
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <ItemGroup>
       <de4dot Include="$(SolutionDir)de4dot\$(Configuration)\net48\*.*" />
@@ -36,8 +40,6 @@
     <MSBuild Projects="$(AssemblyServerProj)" Properties="Configuration=$(Configuration)" />
     <MSBuild Projects="$(de4dot-x64Proj)" Properties="Configuration=$(Configuration)" />
     
-    <RemoveDir Directories="$(SolutionDir)Build" />
-    
     <Copy
             SourceFiles="@(Cli)"
             DestinationFolder="$(SolutionDir)Build\%(RecursiveDir)"
diff --git a/RecodeItLib/Remapper/ReCodeItRemapper.cs b/RecodeItLib/Remapper/ReCodeItRemapper.cs
index 0c68f45..0d5c162 100644
--- a/RecodeItLib/Remapper/ReCodeItRemapper.cs
+++ b/RecodeItLib/Remapper/ReCodeItRemapper.cs
@@ -7,6 +7,7 @@ using ReCodeIt.Utils;
 using ReCodeItLib.Remapper.Search;
 using System.Diagnostics;
 using System.Reflection;
+using ReCodeItLib.Remapper;
 
 namespace ReCodeIt.ReMapper;
 
@@ -59,11 +60,30 @@ public class ReCodeItRemapper
         
         if (!types.Any(t => t.Name.Contains("GClass")))
         {
-            Logger.Log("You must de-obfuscate the assembly before remapping it.\n", ConsoleColor.Red);
-            return;
+            Logger.Log("Assembly is obfuscated, running de-obfuscation...\n", ConsoleColor.Yellow);
+            
+            Module.Dispose();
+            Module = null;
+            
+            Deobfuscator.Deobfuscate(assemblyPath);
+            
+            var cleanedName = Path.GetFileNameWithoutExtension(assemblyPath);
+            cleanedName = $"{cleanedName}-cleaned.dll";
+            
+            var newPath = Path.GetDirectoryName(assemblyPath);
+            newPath = Path.Combine(newPath, cleanedName);
+            
+            Console.WriteLine($"Cleaning assembly: {newPath}");
+            
+            Module = DataProvider.LoadModule(newPath);
+            types = Module.GetTypes();
+            
+            GenerateDynamicRemaps(newPath, types);
+        }
+        else
+        {
+            GenerateDynamicRemaps(assemblyPath, types);
         }
-        
-        GenerateDynamicRemaps(assemblyPath, types);
         
         var tasks = new List<Task>(remapModels.Count);
         foreach (var remap in remapModels)