remove `msf` folder requires

lib/msf/base/sessions/meterpreter_python.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/windows_error'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_x64_win.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/windows_error'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_x86_win.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/windows_error'
 
 module Msf
 module Sessions

lib/msf/core/post/windows/cli_parse.rb

@@ -6,7 +6,6 @@ module Windows
 
 module CliParse
 
-  require 'msf/windows_error'
   require 'rex/logging'
   require 'rex/exceptions'
 

lib/msf/core/reflective_dll_loader.rb

@@ -8,6 +8,8 @@
 #
 ###
 
+require 'rex/peparsey'
+
 module Msf::ReflectiveDLLLoader
 
   # This is the ordinal of the reflective loader by default

lib/msf/ui.rb

@@ -1,7 +0,0 @@
-# -*- coding: binary -*-
-module Msf
-module Ui
-end
-end
-
-require 'rex/ui'

lib/msf/ui/console/command_dispatcher.rb

@@ -1,4 +1,7 @@
 # -*- coding: binary -*-
+
+require 'rex/ui'
+
 module Msf
 module Ui
 module Console

lib/msf/util.rb

@@ -1,29 +0,0 @@
-# -*- coding: binary -*-
-###
-#
-# framework-util
-# --------------
-#
-# The util library miscellaneous routines that involve the framework
-# API, but are not directly related to the core/base/ui structure.
-#
-###
-
-
-require 'rex'
-
-module Msf
-module Util
-
-end
-end
-
-# Executable generation and encoding
-
-# Host helpers
-
-# DBManager helpers
-
-# Java deserialization payload generators
-
-# .NET deserialization payload generators

lib/msf_autoload.rb

@@ -7,6 +7,11 @@ require 'zeitwerk'
 # Correct namespacing to remove the custom inflector (or reduce it's complexity)
 # Correct namespacing to cut down on inflector overrides
 # Make the necessary changes to reduce/remove the ignored/collapsed files and folders
+#
+# I don't know why these are needed in `lib/msf/util/dot_net_deserialization/types.rb`
+#   require 'msf/util/dot_net_deserialization/types/primitives'
+#   require 'msf/util/dot_net_deserialization/types/general'
+#   require 'msf/util/dot_net_deserialization/types/record_values'
 ###
 
 class TempInflector < Zeitwerk::Inflector

modules/exploits/windows/smb/ms10_061_spoolss.rb

@@ -3,7 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/windows_error'
 
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking

msfd

@@ -21,9 +21,7 @@ require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
-require 'msf/base'
-require 'msf/ui'
-
+require 'rex/parser/arguments'
 # Declare the argument parser for msfd
 arguments = Rex::Parser::Arguments.new(
   "-a" => [ true,  "Bind to this IP address instead of loopback"          ],

msfdb

@@ -23,8 +23,6 @@ end
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), 'lib')))
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
-require 'msf/base/config'
-require 'msf/util/helper'
 
 @script_name = File.basename(__FILE__)
 @framework = File.expand_path(File.dirname(__FILE__))

msfrpcd

@@ -120,11 +120,7 @@ if $PROGRAM_NAME == __FILE__
 
   $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
-  require 'msf/base'
-  require 'msf/ui'
-  require 'msf/util/service_helper'
-  require 'msf/base/config'
-  require 'rex/parser/arguments'
+    require 'rex/parser/arguments'
 
   ws_ssl_key_default = File.join(Msf::Config.get_config_root, "#{WS_TAG}-key.pem")
   ws_ssl_cert_default = File.join(Msf::Config.get_config_root, "#{WS_TAG}-cert.pem")
@@ -248,4 +244,4 @@ if $PROGRAM_NAME == __FILE__
                           log: ws_log,
                           pid: ws_rpc_pid) if json_rpc
   end
-end
+end

msfvenom

@@ -29,8 +29,6 @@ def require_deps
   $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
   require 'rex'
-  require 'msf/ui'
-  require 'msf/base'
   require 'msf/core/payload_generator'
   require 'msf/core/constants'