diff --git a/lib/msf/base/simple/auxiliary.rb b/lib/msf/base/simple/auxiliary.rb
index ff3577ffaba97..a0a6ed7024073 100644
--- a/lib/msf/base/simple/auxiliary.rb
+++ b/lib/msf/base/simple/auxiliary.rb
@@ -184,7 +184,6 @@ def self.job_run_proc(ctx, &block)
         raise
       end
     rescue Msf::Auxiliary::Complete
-      mod.cleanup
       return
     rescue Msf::Auxiliary::Failed => e
       mod.error = e
@@ -196,21 +195,18 @@ def self.job_run_proc(ctx, &block)
       end
       mod.fail_detail ||= e.to_s
 
-      mod.cleanup
       return
     rescue ::Timeout::Error => e
       mod.error = e
       mod.fail_reason = Msf::Module::Failure::TimeoutExpired
       mod.fail_detail ||= e.to_s
       mod.print_error("Auxiliary triggered a timeout exception")
-      mod.cleanup
       return
     rescue ::Interrupt => e
       mod.error = e
       mod.fail_reason = Msf::Module::Failure::UserInterrupt
       mod.fail_detail ||= e.to_s
       mod.print_error("Stopping running against current target...")
-      mod.cleanup
       mod.print_status("Control-C again to force quit all targets.")
       begin
         Rex.sleep(0.5)
@@ -237,7 +233,6 @@ def self.job_run_proc(ctx, &block)
       end
 
       elog('Auxiliary failed', error: e)
-      mod.cleanup
 
     end
     return result
diff --git a/lib/msf/base/simple/post.rb b/lib/msf/base/simple/post.rb
index 6e329c79aca44..93628caf2dbbe 100644
--- a/lib/msf/base/simple/post.rb
+++ b/lib/msf/base/simple/post.rb
@@ -112,26 +112,21 @@ def self.job_run_proc(ctx)
         mod.run
       else
         mod.print_error("Session not found")
-        mod.cleanup
         return
       end
     rescue Msf::Post::Complete
-      mod.cleanup
       return
     rescue Msf::Post::Failed => e
       mod.error = e
       mod.print_error("Post aborted due to failure: #{e.message}")
-      mod.cleanup
       return
     rescue ::Timeout::Error => e
       mod.error = e
       mod.print_error("Post triggered a timeout exception")
-      mod.cleanup
       return
     rescue ::Interrupt => e
       mod.error = e
       mod.print_error("Post interrupted by the console user")
-      mod.cleanup
       return
     rescue ::Msf::OptionValidateError => e
       mod.error = e
@@ -148,7 +143,6 @@ def self.job_run_proc(ctx)
       end
 
       elog('Post failed', error: e)
-      mod.cleanup
 
       return
     end
diff --git a/lib/msf/core/exploit_driver.rb b/lib/msf/core/exploit_driver.rb
index f0e51b8bb5d24..47e4e8ebaa133 100644
--- a/lib/msf/core/exploit_driver.rb
+++ b/lib/msf/core/exploit_driver.rb
@@ -176,7 +176,6 @@ def run
       begin
         job_run_proc(ctx)
       rescue ::Interrupt
-        job_cleanup_proc(ctx)
         raise $!
       ensure
         # For multi exploit targets.