diff --git a/lib/msf/util/payload_cached_size.rb b/lib/msf/util/payload_cached_size.rb
index 01bb4b4a34..2503df94a0 100644
--- a/lib/msf/util/payload_cached_size.rb
+++ b/lib/msf/util/payload_cached_size.rb
@@ -139,9 +139,13 @@ class PayloadCachedSize
     opts = OPTS.clone
     # Assign this way to overwrite the Options key of the newly cloned hash
     opts['Options'] = opts['Options'].merge(mod.shortname =~ /6/ ? OPTS_IPV6 : OPTS_IPV4)
-    if mod.arch_to_s == ARCH_X64
+    # Extract the AdaptedArch for adaptor payloads, note `mod.adapted_arch` is not part of the public API
+    # at this time, but could be in the future. The use of send is safe for now as it is an internal tool
+    # with automated tests if the API were to change in the future
+    adapted_arch = mod.send(:module_info)['AdaptedArch']
+    if adapted_arch == ARCH_X64 || mod.arch_to_s == ARCH_X64
       opts['Options'].merge!(OPTS_ARCH_X64)
-    elsif mod.arch_to_s == ARCH_X86
+    elsif adapted_arch == ARCH_X86 || mod.arch_to_s == ARCH_X86
       opts['Options'].merge!(OPTS_ARCH_X86)
     end
     opts
diff --git a/modules/payloads/adapters/cmd/unix/python.rb b/modules/payloads/adapters/cmd/unix/python.rb
index cc25c264ca..1917a77a09 100644
--- a/modules/payloads/adapters/cmd/unix/python.rb
+++ b/modules/payloads/adapters/cmd/unix/python.rb
@@ -30,7 +30,7 @@ module MetasploitModule
     super
   end
 
-  def generate
+  def generate(_opts = {})
     payload = super
 
     if payload.include?("\n")
diff --git a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb
index 01fb4185fb..5040f8110a 100644
--- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb
index 00bf186cf9..dbadc44703 100644
--- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb
index 6ac46b5d3a..beeda7d197 100644
--- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/apple_ios/aarch64/shell_reverse_tcp.rb b/modules/payloads/singles/apple_ios/aarch64/shell_reverse_tcp.rb
index 1c519a400d..7c5de45bf0 100644
--- a/modules/payloads/singles/apple_ios/aarch64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/apple_ios/aarch64/shell_reverse_tcp.rb
@@ -80,7 +80,7 @@ module MetasploitModule
       ])
   end
 
-  def generate
+  def generate(_opts = {})
     p = super
 
     sh = datastore['SHELL']
diff --git a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb
index 5367230e21..e549878248 100644
--- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb
index 2d81f12ccf..c6847dda14 100644
--- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb
index 76c4e69a71..dc445103cd 100644
--- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb b/modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb
index 74443d8b57..aab7caa29c 100644
--- a/modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb
+++ b/modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb
@@ -24,7 +24,7 @@ module MetasploitModule
       'Session'       => Msf::Sessions::CommandShell))
   end
 
-  def generate
+  def generate(_opts = {})
     port    = (datastore['RPORT'] || 0).to_i
     payload =
       "\x9c\x2b\xa0\x07\x94\x1a\xc0\x0b\x92\x10\x20\x01\x90\x10\x20\x02" +
diff --git a/modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb b/modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb
index 1f2f8556da..f9bccb13f7 100644
--- a/modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     port    = (datastore['RPORT'] || '0').to_i
     host    = nil
     begin
diff --git a/modules/payloads/singles/bsd/x64/shell_bind_tcp.rb b/modules/payloads/singles/bsd/x64/shell_bind_tcp.rb
index 9618b4fea2..85d2af2911 100644
--- a/modules/payloads/singles/bsd/x64/shell_bind_tcp.rb
+++ b/modules/payloads/singles/bsd/x64/shell_bind_tcp.rb
@@ -36,7 +36,7 @@ module MetasploitModule
   end
 
   # build the shellcode payload dynamically based on the user-provided CMD
-  def generate
+  def generate(_opts = {})
     cmd  = (datastore['CMD'] || '') + "\x00"
     port = [datastore['LPORT'].to_i].pack('n')
     call = "\xe8" + [cmd.length].pack('V')
diff --git a/modules/payloads/singles/bsd/x64/shell_reverse_tcp.rb b/modules/payloads/singles/bsd/x64/shell_reverse_tcp.rb
index 4c59976a68..6d7a05ad73 100644
--- a/modules/payloads/singles/bsd/x64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/bsd/x64/shell_reverse_tcp.rb
@@ -38,7 +38,7 @@ module MetasploitModule
   end
 
   # build the shellcode payload dynamically based on the user-provided CMD
-  def generate
+  def generate(_opts = {})
     lhost = datastore['LHOST'] || '127.0.0.1'
 
     # OptAddress allows either an IP or hostname, we only want IPv4
diff --git a/modules/payloads/singles/bsd/x86/shell_find_tag.rb b/modules/payloads/singles/bsd/x86/shell_find_tag.rb
index 3087258930..1c691df1a2 100644
--- a/modules/payloads/singles/bsd/x86/shell_find_tag.rb
+++ b/modules/payloads/singles/bsd/x86/shell_find_tag.rb
@@ -41,7 +41,7 @@ module MetasploitModule
   #
   # Ensures the setting of TAG to a four byte value
   #
-  def generate
+  def generate(_opts = {})
     datastore['TAG'] = _find_tag
 
     super
diff --git a/modules/payloads/singles/cmd/mainframe/apf_privesc_jcl.rb b/modules/payloads/singles/cmd/mainframe/apf_privesc_jcl.rb
index e311e18974..8fa935bff1 100644
--- a/modules/payloads/singles/cmd/mainframe/apf_privesc_jcl.rb
+++ b/modules/payloads/singles/cmd/mainframe/apf_privesc_jcl.rb
@@ -76,7 +76,7 @@ module MetasploitModule
   ##
   # Construct Payload
   ##
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/mainframe/bind_shell_jcl.rb b/modules/payloads/singles/cmd/mainframe/bind_shell_jcl.rb
index 0dd281f871..65d12ac72b 100644
--- a/modules/payloads/singles/cmd/mainframe/bind_shell_jcl.rb
+++ b/modules/payloads/singles/cmd/mainframe/bind_shell_jcl.rb
@@ -60,7 +60,7 @@ module MetasploitModule
   ##
   # Construct Payload
   ##
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/mainframe/generic_jcl.rb b/modules/payloads/singles/cmd/mainframe/generic_jcl.rb
index 080227df57..9a7c22258e 100644
--- a/modules/payloads/singles/cmd/mainframe/generic_jcl.rb
+++ b/modules/payloads/singles/cmd/mainframe/generic_jcl.rb
@@ -61,7 +61,7 @@ module MetasploitModule
   ##
   # Construct Payload
   ##
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/mainframe/reverse_shell_jcl.rb b/modules/payloads/singles/cmd/mainframe/reverse_shell_jcl.rb
index d010a608bf..f509d06091 100644
--- a/modules/payloads/singles/cmd/mainframe/reverse_shell_jcl.rb
+++ b/modules/payloads/singles/cmd/mainframe/reverse_shell_jcl.rb
@@ -60,7 +60,7 @@ module MetasploitModule
   ##
   # Construct Payload
   ##
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/bind_awk.rb b/modules/payloads/singles/cmd/unix/bind_awk.rb
index 8c42a54c43..afd6a5528f 100644
--- a/modules/payloads/singles/cmd/unix/bind_awk.rb
+++ b/modules/payloads/singles/cmd/unix/bind_awk.rb
@@ -38,7 +38,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/bind_busybox_telnetd.rb b/modules/payloads/singles/cmd/unix/bind_busybox_telnetd.rb
index 0bc2695430..dc1c7b6f6e 100644
--- a/modules/payloads/singles/cmd/unix/bind_busybox_telnetd.rb
+++ b/modules/payloads/singles/cmd/unix/bind_busybox_telnetd.rb
@@ -45,7 +45,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_inetd.rb b/modules/payloads/singles/cmd/unix/bind_inetd.rb
index 9b1a1de845..2264ff25af 100644
--- a/modules/payloads/singles/cmd/unix/bind_inetd.rb
+++ b/modules/payloads/singles/cmd/unix/bind_inetd.rb
@@ -35,7 +35,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_jjs.rb b/modules/payloads/singles/cmd/unix/bind_jjs.rb
index 0262ad8d8d..c0a4de9d49 100644
--- a/modules/payloads/singles/cmd/unix/bind_jjs.rb
+++ b/modules/payloads/singles/cmd/unix/bind_jjs.rb
@@ -38,7 +38,7 @@ module MetasploitModule
     ]
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/bind_lua.rb b/modules/payloads/singles/cmd/unix/bind_lua.rb
index 86db882c63..6d69376341 100644
--- a/modules/payloads/singles/cmd/unix/bind_lua.rb
+++ b/modules/payloads/singles/cmd/unix/bind_lua.rb
@@ -37,7 +37,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_netcat.rb b/modules/payloads/singles/cmd/unix/bind_netcat.rb
index c55a3ffe61..7120e78cf2 100644
--- a/modules/payloads/singles/cmd/unix/bind_netcat.rb
+++ b/modules/payloads/singles/cmd/unix/bind_netcat.rb
@@ -39,7 +39,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_netcat_gaping.rb b/modules/payloads/singles/cmd/unix/bind_netcat_gaping.rb
index f07112254a..db3fd6521c 100644
--- a/modules/payloads/singles/cmd/unix/bind_netcat_gaping.rb
+++ b/modules/payloads/singles/cmd/unix/bind_netcat_gaping.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_netcat_gaping_ipv6.rb b/modules/payloads/singles/cmd/unix/bind_netcat_gaping_ipv6.rb
index d337ccffb4..02e8f05b8d 100644
--- a/modules/payloads/singles/cmd/unix/bind_netcat_gaping_ipv6.rb
+++ b/modules/payloads/singles/cmd/unix/bind_netcat_gaping_ipv6.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_nodejs.rb b/modules/payloads/singles/cmd/unix/bind_nodejs.rb
index 1ba951728e..7c1230549e 100644
--- a/modules/payloads/singles/cmd/unix/bind_nodejs.rb
+++ b/modules/payloads/singles/cmd/unix/bind_nodejs.rb
@@ -28,7 +28,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/bind_perl.rb b/modules/payloads/singles/cmd/unix/bind_perl.rb
index 6bea28a6df..27271d35a3 100644
--- a/modules/payloads/singles/cmd/unix/bind_perl.rb
+++ b/modules/payloads/singles/cmd/unix/bind_perl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_perl_ipv6.rb b/modules/payloads/singles/cmd/unix/bind_perl_ipv6.rb
index 9ca4d7bb87..a221932228 100644
--- a/modules/payloads/singles/cmd/unix/bind_perl_ipv6.rb
+++ b/modules/payloads/singles/cmd/unix/bind_perl_ipv6.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_r.rb b/modules/payloads/singles/cmd/unix/bind_r.rb
index 1df342901e..6a9097d46a 100644
--- a/modules/payloads/singles/cmd/unix/bind_r.rb
+++ b/modules/payloads/singles/cmd/unix/bind_r.rb
@@ -28,7 +28,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return prepends(r_string)
   end
 
diff --git a/modules/payloads/singles/cmd/unix/bind_ruby.rb b/modules/payloads/singles/cmd/unix/bind_ruby.rb
index 4d005a632f..6285dad19f 100644
--- a/modules/payloads/singles/cmd/unix/bind_ruby.rb
+++ b/modules/payloads/singles/cmd/unix/bind_ruby.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_ruby_ipv6.rb b/modules/payloads/singles/cmd/unix/bind_ruby_ipv6.rb
index 1ff6c23060..97b5b9b78b 100644
--- a/modules/payloads/singles/cmd/unix/bind_ruby_ipv6.rb
+++ b/modules/payloads/singles/cmd/unix/bind_ruby_ipv6.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_socat_udp.rb b/modules/payloads/singles/cmd/unix/bind_socat_udp.rb
index 160788ee04..c1605f1f16 100644
--- a/modules/payloads/singles/cmd/unix/bind_socat_udp.rb
+++ b/modules/payloads/singles/cmd/unix/bind_socat_udp.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/bind_stub.rb b/modules/payloads/singles/cmd/unix/bind_stub.rb
index a252582a87..399ba2d910 100644
--- a/modules/payloads/singles/cmd/unix/bind_stub.rb
+++ b/modules/payloads/singles/cmd/unix/bind_stub.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Generate an empty payload
   #
-  def generate
+  def generate(_opts = {})
     ''
   end
 end
diff --git a/modules/payloads/singles/cmd/unix/bind_zsh.rb b/modules/payloads/singles/cmd/unix/bind_zsh.rb
index e7a213883c..07607ca097 100644
--- a/modules/payloads/singles/cmd/unix/bind_zsh.rb
+++ b/modules/payloads/singles/cmd/unix/bind_zsh.rb
@@ -41,7 +41,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/generic.rb b/modules/payloads/singles/cmd/unix/generic.rb
index 465a578e42..a40b5eafc5 100644
--- a/modules/payloads/singles/cmd/unix/generic.rb
+++ b/modules/payloads/singles/cmd/unix/generic.rb
@@ -39,7 +39,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/pingback_bind.rb b/modules/payloads/singles/cmd/unix/pingback_bind.rb
index e9c7a0856d..589f9be42b 100644
--- a/modules/payloads/singles/cmd/unix/pingback_bind.rb
+++ b/modules/payloads/singles/cmd/unix/pingback_bind.rb
@@ -33,7 +33,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super.to_s + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/pingback_reverse.rb b/modules/payloads/singles/cmd/unix/pingback_reverse.rb
index e1b9e86475..2720374d4e 100644
--- a/modules/payloads/singles/cmd/unix/pingback_reverse.rb
+++ b/modules/payloads/singles/cmd/unix/pingback_reverse.rb
@@ -33,7 +33,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super.to_s + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse.rb b/modules/payloads/singles/cmd/unix/reverse.rb
index ab1494300c..6d0f0fcdde 100644
--- a/modules/payloads/singles/cmd/unix/reverse.rb
+++ b/modules/payloads/singles/cmd/unix/reverse.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_awk.rb b/modules/payloads/singles/cmd/unix/reverse_awk.rb
index ecb165a5bd..aff909947f 100644
--- a/modules/payloads/singles/cmd/unix/reverse_awk.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_awk.rb
@@ -39,7 +39,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_bash.rb b/modules/payloads/singles/cmd/unix/reverse_bash.rb
index a8f23297f5..824f8b5fe3 100644
--- a/modules/payloads/singles/cmd/unix/reverse_bash.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_bash.rb
@@ -40,7 +40,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_bash_telnet_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_bash_telnet_ssl.rb
index 57358f6d0c..fc435ee087 100644
--- a/modules/payloads/singles/cmd/unix/reverse_bash_telnet_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_bash_telnet_ssl.rb
@@ -39,7 +39,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_bash_udp.rb b/modules/payloads/singles/cmd/unix/reverse_bash_udp.rb
index 4805d642f1..a976410630 100644
--- a/modules/payloads/singles/cmd/unix/reverse_bash_udp.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_bash_udp.rb
@@ -43,7 +43,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_jjs.rb b/modules/payloads/singles/cmd/unix/reverse_jjs.rb
index 135afd66a7..b045f39c9b 100644
--- a/modules/payloads/singles/cmd/unix/reverse_jjs.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_jjs.rb
@@ -38,7 +38,7 @@ module MetasploitModule
     ]
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_ksh.rb b/modules/payloads/singles/cmd/unix/reverse_ksh.rb
index b91af2e0b6..b40bfa9720 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ksh.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ksh.rb
@@ -30,7 +30,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_lua.rb b/modules/payloads/singles/cmd/unix/reverse_lua.rb
index 6076b1bd59..3ef3e4b856 100644
--- a/modules/payloads/singles/cmd/unix/reverse_lua.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_lua.rb
@@ -37,7 +37,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_ncat_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_ncat_ssl.rb
index 9f6f37e5f2..0e84e79869 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ncat_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ncat_ssl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_netcat.rb b/modules/payloads/singles/cmd/unix/reverse_netcat.rb
index 0f9876835f..96d3253494 100644
--- a/modules/payloads/singles/cmd/unix/reverse_netcat.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_netcat.rb
@@ -39,7 +39,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_netcat_gaping.rb b/modules/payloads/singles/cmd/unix/reverse_netcat_gaping.rb
index 1045901eb4..3535cbce0e 100644
--- a/modules/payloads/singles/cmd/unix/reverse_netcat_gaping.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_netcat_gaping.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_nodejs.rb b/modules/payloads/singles/cmd/unix/reverse_nodejs.rb
index 9665756471..96bc56408d 100644
--- a/modules/payloads/singles/cmd/unix/reverse_nodejs.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_nodejs.rb
@@ -28,7 +28,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_openssl.rb b/modules/payloads/singles/cmd/unix/reverse_openssl.rb
index 2a6c392386..9272a7493f 100644
--- a/modules/payloads/singles/cmd/unix/reverse_openssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_openssl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_perl.rb b/modules/payloads/singles/cmd/unix/reverse_perl.rb
index 05f3a0caca..066fa63a17 100644
--- a/modules/payloads/singles/cmd/unix/reverse_perl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_perl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_perl_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_perl_ssl.rb
index 44e7f6e2c0..ccf4a0a3a0 100644
--- a/modules/payloads/singles/cmd/unix/reverse_perl_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_perl_ssl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_php_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_php_ssl.rb
index c1f5827266..a3a3198bce 100644
--- a/modules/payloads/singles/cmd/unix/reverse_php_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_php_ssl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_python.rb b/modules/payloads/singles/cmd/unix/reverse_python.rb
index 48f7c94f66..c614105b84 100644
--- a/modules/payloads/singles/cmd/unix/reverse_python.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_python.rb
@@ -32,7 +32,7 @@ module MetasploitModule
     ])
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_python_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_python_ssl.rb
index c353de479b..9c549c02b4 100644
--- a/modules/payloads/singles/cmd/unix/reverse_python_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_python_ssl.rb
@@ -35,7 +35,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_r.rb b/modules/payloads/singles/cmd/unix/reverse_r.rb
index 6a839bcdf1..957c91c821 100644
--- a/modules/payloads/singles/cmd/unix/reverse_r.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_r.rb
@@ -28,7 +28,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return prepends(r_string)
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_ruby.rb b/modules/payloads/singles/cmd/unix/reverse_ruby.rb
index ab239f1a8d..dccb33893b 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ruby.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ruby.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_ruby_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_ruby_ssl.rb
index b47a0b5de0..67557d34b8 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ruby_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ruby_ssl.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_socat_udp.rb b/modules/payloads/singles/cmd/unix/reverse_socat_udp.rb
index f5ea8597f8..ee841b0b59 100644
--- a/modules/payloads/singles/cmd/unix/reverse_socat_udp.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_socat_udp.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_ssh.rb b/modules/payloads/singles/cmd/unix/reverse_ssh.rb
index c7cd306b03..dae66a0f72 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ssh.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ssh.rb
@@ -43,7 +43,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_ssl_double_telnet.rb b/modules/payloads/singles/cmd/unix/reverse_ssl_double_telnet.rb
index fdd26c4afa..7fc7f6b0ed 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ssl_double_telnet.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ssl_double_telnet.rb
@@ -37,7 +37,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     vprint_good(command_string)
     return super + command_string
   end
diff --git a/modules/payloads/singles/cmd/unix/reverse_stub.rb b/modules/payloads/singles/cmd/unix/reverse_stub.rb
index 486497c5a1..ca05495db0 100644
--- a/modules/payloads/singles/cmd/unix/reverse_stub.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_stub.rb
@@ -33,7 +33,7 @@ module MetasploitModule
   #
   # Generate an empty payload
   #
-  def generate
+  def generate(_opts = {})
     ''
   end
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_tclsh.rb b/modules/payloads/singles/cmd/unix/reverse_tclsh.rb
index 8739aeafde..0ee4093e5e 100644
--- a/modules/payloads/singles/cmd/unix/reverse_tclsh.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_tclsh.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_zsh.rb b/modules/payloads/singles/cmd/unix/reverse_zsh.rb
index 2233584be9..6c9314820d 100644
--- a/modules/payloads/singles/cmd/unix/reverse_zsh.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_zsh.rb
@@ -34,7 +34,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/adduser.rb b/modules/payloads/singles/cmd/windows/adduser.rb
index be88691f29..9611741743 100644
--- a/modules/payloads/singles/cmd/windows/adduser.rb
+++ b/modules/payloads/singles/cmd/windows/adduser.rb
@@ -53,7 +53,7 @@ module MetasploitModule
 
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/bind_lua.rb b/modules/payloads/singles/cmd/windows/bind_lua.rb
index e54f204bc8..1388c6dfb2 100644
--- a/modules/payloads/singles/cmd/windows/bind_lua.rb
+++ b/modules/payloads/singles/cmd/windows/bind_lua.rb
@@ -37,7 +37,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/bind_perl.rb b/modules/payloads/singles/cmd/windows/bind_perl.rb
index d3c6de5b3c..1a15a55f02 100644
--- a/modules/payloads/singles/cmd/windows/bind_perl.rb
+++ b/modules/payloads/singles/cmd/windows/bind_perl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/bind_perl_ipv6.rb b/modules/payloads/singles/cmd/windows/bind_perl_ipv6.rb
index 5210fa3058..37e3ff3a2d 100644
--- a/modules/payloads/singles/cmd/windows/bind_perl_ipv6.rb
+++ b/modules/payloads/singles/cmd/windows/bind_perl_ipv6.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/bind_ruby.rb b/modules/payloads/singles/cmd/windows/bind_ruby.rb
index 4a3e1dc2e1..d8033f888a 100644
--- a/modules/payloads/singles/cmd/windows/bind_ruby.rb
+++ b/modules/payloads/singles/cmd/windows/bind_ruby.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/download_eval_vbs.rb b/modules/payloads/singles/cmd/windows/download_eval_vbs.rb
index fd4fd7eda4..34b9d7c219 100644
--- a/modules/payloads/singles/cmd/windows/download_eval_vbs.rb
+++ b/modules/payloads/singles/cmd/windows/download_eval_vbs.rb
@@ -40,7 +40,7 @@ module MetasploitModule
       ])
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/download_exec_vbs.rb b/modules/payloads/singles/cmd/windows/download_exec_vbs.rb
index d25ba9c9cd..890ba6f7fb 100644
--- a/modules/payloads/singles/cmd/windows/download_exec_vbs.rb
+++ b/modules/payloads/singles/cmd/windows/download_exec_vbs.rb
@@ -39,7 +39,7 @@ module MetasploitModule
       ])
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/generic.rb b/modules/payloads/singles/cmd/windows/generic.rb
index f283d39606..468f036351 100644
--- a/modules/payloads/singles/cmd/windows/generic.rb
+++ b/modules/payloads/singles/cmd/windows/generic.rb
@@ -39,7 +39,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/jjs_reverse_tcp.rb b/modules/payloads/singles/cmd/windows/jjs_reverse_tcp.rb
index b144e81885..edd5add1b4 100644
--- a/modules/payloads/singles/cmd/windows/jjs_reverse_tcp.rb
+++ b/modules/payloads/singles/cmd/windows/jjs_reverse_tcp.rb
@@ -40,7 +40,7 @@ module MetasploitModule
     ]
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb b/modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
index 2c92c7bac5..99a2f169a2 100644
--- a/modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
+++ b/modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
       ))
   end
 
-  def generate
+  def generate(_opts = {})
     generate_powershell_code("Bind")
   end
 end
diff --git a/modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb b/modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb
index 4eb89d586e..4337107e4f 100644
--- a/modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb
+++ b/modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb
@@ -38,7 +38,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     generate_powershell_code('Reverse')
   end
 end
diff --git a/modules/payloads/singles/cmd/windows/powershell_reverse_tcp_ssl.rb b/modules/payloads/singles/cmd/windows/powershell_reverse_tcp_ssl.rb
index d54f19e47b..a810df7862 100644
--- a/modules/payloads/singles/cmd/windows/powershell_reverse_tcp_ssl.rb
+++ b/modules/payloads/singles/cmd/windows/powershell_reverse_tcp_ssl.rb
@@ -38,7 +38,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     generate_powershell_code('SSL')
   end
 end
diff --git a/modules/payloads/singles/cmd/windows/reverse_lua.rb b/modules/payloads/singles/cmd/windows/reverse_lua.rb
index 39fa3e2bc4..cf01abaa1f 100644
--- a/modules/payloads/singles/cmd/windows/reverse_lua.rb
+++ b/modules/payloads/singles/cmd/windows/reverse_lua.rb
@@ -37,7 +37,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/reverse_perl.rb b/modules/payloads/singles/cmd/windows/reverse_perl.rb
index 5ef57ace42..d1e649f1f1 100644
--- a/modules/payloads/singles/cmd/windows/reverse_perl.rb
+++ b/modules/payloads/singles/cmd/windows/reverse_perl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/reverse_powershell.rb b/modules/payloads/singles/cmd/windows/reverse_powershell.rb
index 8518e3b263..e1e70e9799 100644
--- a/modules/payloads/singles/cmd/windows/reverse_powershell.rb
+++ b/modules/payloads/singles/cmd/windows/reverse_powershell.rb
@@ -43,7 +43,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/cmd/windows/reverse_ruby.rb b/modules/payloads/singles/cmd/windows/reverse_ruby.rb
index 4818b53b0b..3bebd9f53a 100644
--- a/modules/payloads/singles/cmd/windows/reverse_ruby.rb
+++ b/modules/payloads/singles/cmd/windows/reverse_ruby.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string
   end
 
diff --git a/modules/payloads/singles/firefox/exec.rb b/modules/payloads/singles/firefox/exec.rb
index 002d07c520..be45abd248 100644
--- a/modules/payloads/singles/firefox/exec.rb
+++ b/modules/payloads/singles/firefox/exec.rb
@@ -30,7 +30,7 @@ module MetasploitModule
     ])
   end
 
-  def generate
+  def generate(_opts = {})
     <<-EOS
 
       (function(){
diff --git a/modules/payloads/singles/firefox/shell_bind_tcp.rb b/modules/payloads/singles/firefox/shell_bind_tcp.rb
index ceecbcf92c..f211b33524 100644
--- a/modules/payloads/singles/firefox/shell_bind_tcp.rb
+++ b/modules/payloads/singles/firefox/shell_bind_tcp.rb
@@ -29,7 +29,7 @@ module MetasploitModule
   #
   # Returns the JS string to use for execution
   #
-  def generate
+  def generate(_opts = {})
     %Q|
     (function(){
       window = this;
diff --git a/modules/payloads/singles/firefox/shell_reverse_tcp.rb b/modules/payloads/singles/firefox/shell_reverse_tcp.rb
index d8c199884d..04796a2aa3 100644
--- a/modules/payloads/singles/firefox/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/firefox/shell_reverse_tcp.rb
@@ -26,7 +26,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     <<-EOS
 
       (function(){
diff --git a/modules/payloads/singles/generic/custom.rb b/modules/payloads/singles/generic/custom.rb
index a4cbae3a6a..7887306346 100644
--- a/modules/payloads/singles/generic/custom.rb
+++ b/modules/payloads/singles/generic/custom.rb
@@ -35,7 +35,7 @@ module MetasploitModule
   #
   # Construct the payload
   #
-  def generate
+  def generate(_opts = {})
     if datastore['ARCH']
       self.arch = actual_arch
     end
diff --git a/modules/payloads/singles/java/jsp_shell_bind_tcp.rb b/modules/payloads/singles/java/jsp_shell_bind_tcp.rb
index f38180a879..a7cc71b3cf 100644
--- a/modules/payloads/singles/java/jsp_shell_bind_tcp.rb
+++ b/modules/payloads/singles/java/jsp_shell_bind_tcp.rb
@@ -31,7 +31,7 @@ module MetasploitModule
   end
 
 
-  def generate
+  def generate(_opts = {})
     return super + jsp_bind_tcp
   end
 end
diff --git a/modules/payloads/singles/java/jsp_shell_reverse_tcp.rb b/modules/payloads/singles/java/jsp_shell_reverse_tcp.rb
index a9285a246a..b4d318713e 100644
--- a/modules/payloads/singles/java/jsp_shell_reverse_tcp.rb
+++ b/modules/payloads/singles/java/jsp_shell_reverse_tcp.rb
@@ -31,7 +31,7 @@ module MetasploitModule
   end
 
 
-  def generate
+  def generate(_opts = {})
 
     if( !datastore['LHOST'] or datastore['LHOST'].empty? )
       return super
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb
index 562b320c97..44229bd628 100644
--- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb
index 25c7db5d9c..b75647deec 100644
--- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb
index 0a3aa50b0f..e1b305a390 100644
--- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/aarch64/shell_reverse_tcp.rb b/modules/payloads/singles/linux/aarch64/shell_reverse_tcp.rb
index a8f87b69b3..a15bef0f47 100644
--- a/modules/payloads/singles/linux/aarch64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/aarch64/shell_reverse_tcp.rb
@@ -80,7 +80,7 @@ module MetasploitModule
       ])
   end
 
-  def generate
+  def generate(_opts = {})
     p = super
 
     sh = datastore['SHELL']
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb
index e3ff5aaabb..8dfcf9a954 100644
--- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb
index 1f9713ba24..6cc24c3325 100644
--- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb
index ff5bb8d22d..96af6e2a2c 100644
--- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb b/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb
index af1fa5cba2..b8e5321a39 100644
--- a/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb
@@ -31,7 +31,7 @@ module MetasploitModule
         Opt::LPORT(4444)
       ])
   end
-  def generate
+  def generate(_opts = {})
     cmd = (datastore['CMD'] || '') + "\x00"
     bytehigh = (datastore['LPORT'].to_i >> 8).chr
     bytelow = (datastore['LPORT'].to_i & 0xFF).chr
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb
index e57cd99ad3..e6cb7d77b2 100644
--- a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb
index 988e441721..47126b0c83 100644
--- a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb
index 357fddea07..0cf0d473d6 100644
--- a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/armle/shell_bind_tcp.rb b/modules/payloads/singles/linux/armle/shell_bind_tcp.rb
index 5b294f5a50..3152c58470 100644
--- a/modules/payloads/singles/linux/armle/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/armle/shell_bind_tcp.rb
@@ -114,7 +114,7 @@ module MetasploitModule
       ])
   end
 
-  def generate
+  def generate(_opts = {})
     p = super
 
     sh = datastore['SHELL']
diff --git a/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb b/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb
index 80c869700f..32bcbe2c43 100644
--- a/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb
@@ -114,7 +114,7 @@ module MetasploitModule
       ])
   end
 
-  def generate
+  def generate(_opts = {})
     p = super
 
     sh = datastore['SHELL']
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb
index 8e748ebe22..668e5c2c0d 100644
--- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb
index 3e0b0838ba..9f7865e140 100644
--- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb
index 126a19aed8..4025df9f31 100644
--- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/mipsbe/exec.rb b/modules/payloads/singles/linux/mipsbe/exec.rb
index 5f1616eda5..eb707995d1 100644
--- a/modules/payloads/singles/linux/mipsbe/exec.rb
+++ b/modules/payloads/singles/linux/mipsbe/exec.rb
@@ -48,7 +48,7 @@ module MetasploitModule
     return datastore['CMD'] || ''
   end
 
-  def generate
+  def generate(_opts = {})
 
     shellcode =
       "\x24\x06\x06\x66" + #li a2,1638
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb
index 2f4beb8ad5..7f0163dedd 100644
--- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb
index d9edb34ffb..459c475671 100644
--- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb
index 0c3311b1d0..f575ab5b6f 100644
--- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/mipsbe/reboot.rb b/modules/payloads/singles/linux/mipsbe/reboot.rb
index aea28b28e7..a16cf8ab78 100644
--- a/modules/payloads/singles/linux/mipsbe/reboot.rb
+++ b/modules/payloads/singles/linux/mipsbe/reboot.rb
@@ -38,7 +38,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     shellcode =
       "\x3c\x06\x43\x21" +  #lui     a2,0x4321
       "\x34\xc6\xfe\xdc" +  #ori     a2,a2,0xfedc
diff --git a/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb b/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb
index 16c0ec8da8..31e039c93f 100644
--- a/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb
@@ -36,7 +36,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     if !datastore['LPORT']
       return super
     end
diff --git a/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb b/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb
index b08d052344..1ef5c4ec23 100644
--- a/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb
@@ -38,7 +38,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     if( !datastore['LHOST'] or datastore['LHOST'].empty? )
       return super
     end
diff --git a/modules/payloads/singles/linux/mipsle/exec.rb b/modules/payloads/singles/linux/mipsle/exec.rb
index 545d5f3650..435f767fef 100644
--- a/modules/payloads/singles/linux/mipsle/exec.rb
+++ b/modules/payloads/singles/linux/mipsle/exec.rb
@@ -49,7 +49,7 @@ module MetasploitModule
     return datastore['CMD'] || ''
   end
 
-  def generate
+  def generate(_opts = {})
 
     shellcode =
       "\x66\x06\x06\x24" + # li a2,1638
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb
index 0951880ff6..568e0b2371 100644
--- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb
index 0a5e923269..928dfab788 100644
--- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb
index bcff6f4dad..d80f2fadd5 100644
--- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/mipsle/reboot.rb b/modules/payloads/singles/linux/mipsle/reboot.rb
index 9e9fc02aad..84172e7335 100644
--- a/modules/payloads/singles/linux/mipsle/reboot.rb
+++ b/modules/payloads/singles/linux/mipsle/reboot.rb
@@ -37,7 +37,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     shellcode =
       "\x21\x43\x06\x3c" +  # lui     a2,0x4321
       "\xdc\xfe\xc6\x34" +  # ori     a2,a2,0xfedc
diff --git a/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb b/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb
index e49e0fc539..8850fe020c 100644
--- a/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb
@@ -36,7 +36,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     if !datastore['LPORT']
       return super
     end
diff --git a/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb b/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb
index 0c0ac5c21b..4ec88cb4e1 100644
--- a/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb
@@ -34,7 +34,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     if( !datastore['LHOST'] or datastore['LHOST'].empty? )
       return super
     end
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb
index d7e722619e..78b41c826e 100644
--- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb
index 216abfec76..f9c86f8d59 100644
--- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb
index aea64d9fc8..da4178804a 100644
--- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb
index 3cd893d130..1fbcb6dbdb 100644
--- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb
index f7d5a63392..2a41141eb6 100644
--- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb
index 9f9a5352fb..fd0b9092cf 100644
--- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb
index a4cff3618e..17861f25e3 100644
--- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb
index 67f5dab237..f16bd04db2 100644
--- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb
index 8cca4f63de..400ecc8190 100644
--- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb
index 7fc5ef0d2a..da2555b22e 100644
--- a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb
index 0bf908c00c..ef3456ed02 100644
--- a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb
index b8b83b9bfe..ac20fb48c8 100644
--- a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb
index ad2c429a19..ab273acf87 100644
--- a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb
index f7ea16a597..f5770d741a 100644
--- a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb
index c875c76abd..44502e4f05 100644
--- a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb b/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb
index ff09c70e91..c5fa747e86 100644
--- a/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb
+++ b/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb
@@ -27,7 +27,7 @@ module MetasploitModule
       ))
   end
 
-  def generate
+  def generate(_opts = {})
     unless self.available_space.nil? || self.available_space >= 57
       payload = <<-EOS
         preparation:
diff --git a/modules/payloads/singles/linux/x86/shell_find_tag.rb b/modules/payloads/singles/linux/x86/shell_find_tag.rb
index b15ada4dfc..dfa9b6ab5d 100644
--- a/modules/payloads/singles/linux/x86/shell_find_tag.rb
+++ b/modules/payloads/singles/linux/x86/shell_find_tag.rb
@@ -41,7 +41,7 @@ module MetasploitModule
   #
   # Ensures the setting of TAG to a four byte value
   #
-  def generate
+  def generate(_opts = {})
     datastore['TAG'] = _find_tag
 
     super
diff --git a/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb b/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
index 0bc1ad4928..92a4c2d98e 100644
--- a/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
@@ -29,7 +29,7 @@ module MetasploitModule
     ])
   end
 
-  def generate
+  def generate(_opts = {})
     # pad the shell path to a multiple of 4 with slashes
     shell = datastore['CMD']
     remainder = shell.bytes.length % 4
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb
index e674b21bfd..887837bfd8 100644
--- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb
index b8f57b82c1..5dd143cc23 100644
--- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb
index 9102b5fe43..940d33274b 100644
--- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/nodejs/shell_bind_tcp.rb b/modules/payloads/singles/nodejs/shell_bind_tcp.rb
index e0519eb7e7..7a9f374694 100644
--- a/modules/payloads/singles/nodejs/shell_bind_tcp.rb
+++ b/modules/payloads/singles/nodejs/shell_bind_tcp.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/nodejs/shell_reverse_tcp.rb b/modules/payloads/singles/nodejs/shell_reverse_tcp.rb
index c3f056a87d..8a604c7ea9 100644
--- a/modules/payloads/singles/nodejs/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/nodejs/shell_reverse_tcp.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/nodejs/shell_reverse_tcp_ssl.rb b/modules/payloads/singles/nodejs/shell_reverse_tcp_ssl.rb
index cc0db7cc22..a23b0581cd 100644
--- a/modules/payloads/singles/nodejs/shell_reverse_tcp_ssl.rb
+++ b/modules/payloads/singles/nodejs/shell_reverse_tcp_ssl.rb
@@ -30,7 +30,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/osx/armle/vibrate.rb b/modules/payloads/singles/osx/armle/vibrate.rb
index deb94d0a36..fbeee30641 100644
--- a/modules/payloads/singles/osx/armle/vibrate.rb
+++ b/modules/payloads/singles/osx/armle/vibrate.rb
@@ -23,7 +23,7 @@ module MetasploitModule
       'Arch'          => ARCH_ARMLE))
   end
 
-  def generate
+  def generate(_opts = {})
     [
       0xe1a00820, #  mov r0, r0, lsr #16
       0xe51ff004, #  ldr pc, [pc, #-4]
diff --git a/modules/payloads/singles/osx/x64/exec.rb b/modules/payloads/singles/osx/x64/exec.rb
index 6735236cc0..a97a64e8a5 100644
--- a/modules/payloads/singles/osx/x64/exec.rb
+++ b/modules/payloads/singles/osx/x64/exec.rb
@@ -27,7 +27,7 @@ module MetasploitModule
   end
 
   # build the shellcode payload dynamically based on the user-provided CMD
-  def generate
+  def generate(_opts = {})
     cmd_str = datastore['CMD'] || ''
     # Split the cmd string into arg chunks
     cmd_parts = Shellwords.shellsplit(cmd_str)
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb
index 7537eaa8f1..949ba39aa4 100644
--- a/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'http',
       stageless: true
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb
index 95bf53c7cd..6e4fd19175 100644
--- a/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'https',
       stageless: true
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb
index 4cfaffb2f8..fa3fca3162 100644
--- a/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
     )
   end
 
-  def generate
+  def generate(_opts = {})
     opts = {
       scheme: 'tcp',
       stageless: true
diff --git a/modules/payloads/singles/osx/x64/say.rb b/modules/payloads/singles/osx/x64/say.rb
index ab9cc23e9c..c1b39a1300 100644
--- a/modules/payloads/singles/osx/x64/say.rb
+++ b/modules/payloads/singles/osx/x64/say.rb
@@ -27,7 +27,7 @@ module MetasploitModule
   end
 
   # build the shellcode payload dynamically based on the user-provided CMD
-  def generate
+  def generate(_opts = {})
     say = (datastore['TEXT'] || '') << "\x00"
     call = "\xe8" + [say.length + 0xd].pack('V')
 
diff --git a/modules/payloads/singles/osx/x64/shell_bind_tcp.rb b/modules/payloads/singles/osx/x64/shell_bind_tcp.rb
index 4c1c7ef77b..845df67187 100644
--- a/modules/payloads/singles/osx/x64/shell_bind_tcp.rb
+++ b/modules/payloads/singles/osx/x64/shell_bind_tcp.rb
@@ -33,7 +33,7 @@ module MetasploitModule
   end
 
   # build the shellcode payload dynamically based on the user-provided CMD
-  def generate
+  def generate(_opts = {})
     cmd  = (datastore['CMD'] || '') + "\x00"
     port = [datastore['LPORT'].to_i].pack('n')
     call = "\xe8" + [cmd.length].pack('V')
diff --git a/modules/payloads/singles/osx/x64/shell_find_tag.rb b/modules/payloads/singles/osx/x64/shell_find_tag.rb
index dbee0f4771..3a6770f62e 100644
--- a/modules/payloads/singles/osx/x64/shell_find_tag.rb
+++ b/modules/payloads/singles/osx/x64/shell_find_tag.rb
@@ -35,7 +35,7 @@ module MetasploitModule
   #
   # ensures the setting of tag to a four byte value
   #
-  def generate
+  def generate(_opts = {})
     cmd  = (datastore['CMD'] || '') + "\x00"
     call = "\xe8" + [cmd.length].pack('V')
 
diff --git a/modules/payloads/singles/osx/x64/shell_reverse_tcp.rb b/modules/payloads/singles/osx/x64/shell_reverse_tcp.rb
index 1466a670e0..6cf43b572c 100644
--- a/modules/payloads/singles/osx/x64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/osx/x64/shell_reverse_tcp.rb
@@ -37,7 +37,7 @@ module MetasploitModule
   end
 
   # build the shellcode payload dynamically based on the user-provided CMD
-  def generate
+  def generate(_opts = {})
     lhost = datastore['LHOST'] || '127.0.0.1'
     # OptAddress allows either an IP or hostname, we only want IPv4
     unless Rex::Socket.is_ipv4?(lhost)
diff --git a/modules/payloads/singles/php/bind_perl.rb b/modules/payloads/singles/php/bind_perl.rb
index 8384c7c498..4c3cc17d7b 100644
--- a/modules/payloads/singles/php/bind_perl.rb
+++ b/modules/payloads/singles/php/bind_perl.rb
@@ -33,7 +33,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + "system(base64_decode('#{Rex::Text.encode_base64(command_string)}'));"
   end
 
diff --git a/modules/payloads/singles/php/bind_perl_ipv6.rb b/modules/payloads/singles/php/bind_perl_ipv6.rb
index e51e21f21b..1248b36cea 100644
--- a/modules/payloads/singles/php/bind_perl_ipv6.rb
+++ b/modules/payloads/singles/php/bind_perl_ipv6.rb
@@ -33,7 +33,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + "system(base64_decode('#{Rex::Text.encode_base64(command_string)}'));"
   end
 
diff --git a/modules/payloads/singles/php/bind_php.rb b/modules/payloads/singles/php/bind_php.rb
index fbb4d1014d..334fe37c5e 100644
--- a/modules/payloads/singles/php/bind_php.rb
+++ b/modules/payloads/singles/php/bind_php.rb
@@ -75,7 +75,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + php_bind_shell
   end
 end
diff --git a/modules/payloads/singles/php/bind_php_ipv6.rb b/modules/payloads/singles/php/bind_php_ipv6.rb
index 4d0af0d964..6a91473f9c 100644
--- a/modules/payloads/singles/php/bind_php_ipv6.rb
+++ b/modules/payloads/singles/php/bind_php_ipv6.rb
@@ -75,7 +75,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + php_bind_shell
   end
 end
diff --git a/modules/payloads/singles/php/download_exec.rb b/modules/payloads/singles/php/download_exec.rb
index dc4e5a3691..037c2455a7 100644
--- a/modules/payloads/singles/php/download_exec.rb
+++ b/modules/payloads/singles/php/download_exec.rb
@@ -73,7 +73,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return php_exec_file
   end
 end
diff --git a/modules/payloads/singles/php/exec.rb b/modules/payloads/singles/php/exec.rb
index d4adc40653..3b19e08317 100644
--- a/modules/payloads/singles/php/exec.rb
+++ b/modules/payloads/singles/php/exec.rb
@@ -43,7 +43,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return php_exec_cmd
   end
 end
diff --git a/modules/payloads/singles/php/meterpreter_reverse_tcp.rb b/modules/payloads/singles/php/meterpreter_reverse_tcp.rb
index 73889b514a..bfd845d4c8 100644
--- a/modules/payloads/singles/php/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/php/meterpreter_reverse_tcp.rb
@@ -25,7 +25,7 @@ module MetasploitModule
       'Session'       => Msf::Sessions::Meterpreter_Php_Php))
   end
 
-  def generate
+  def generate(_opts = {})
     met = MetasploitPayloads.read('meterpreter', 'meterpreter.php')
 
     met.gsub!("127.0.0.1", datastore['LHOST']) if datastore['LHOST']
diff --git a/modules/payloads/singles/php/reverse_perl.rb b/modules/payloads/singles/php/reverse_perl.rb
index c620870170..33dd54abd8 100644
--- a/modules/payloads/singles/php/reverse_perl.rb
+++ b/modules/payloads/singles/php/reverse_perl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     buf = "#{php_preamble}"
     buf += "$c = base64_decode('#{Rex::Text.encode_base64(command_string)}');"
     buf += "#{php_system_block({:cmd_varname=>"$c"})}"
diff --git a/modules/payloads/singles/php/reverse_php.rb b/modules/payloads/singles/php/reverse_php.rb
index 02eccd529f..36f3230566 100644
--- a/modules/payloads/singles/php/reverse_php.rb
+++ b/modules/payloads/singles/php/reverse_php.rb
@@ -121,7 +121,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return super + php_reverse_shell
   end
 end
diff --git a/modules/payloads/singles/php/shell_findsock.rb b/modules/payloads/singles/php/shell_findsock.rb
index 55f3fdb567..849bd14a67 100644
--- a/modules/payloads/singles/php/shell_findsock.rb
+++ b/modules/payloads/singles/php/shell_findsock.rb
@@ -76,7 +76,7 @@ END_OF_PHP_CODE
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     return php_findsock
   end
 end
diff --git a/modules/payloads/singles/python/pingback_bind_tcp.rb b/modules/payloads/singles/python/pingback_bind_tcp.rb
index 118c5c5477..3bf5bde2ab 100644
--- a/modules/payloads/singles/python/pingback_bind_tcp.rb
+++ b/modules/payloads/singles/python/pingback_bind_tcp.rb
@@ -21,7 +21,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     super.to_s + command_string
   end
   def command_string
diff --git a/modules/payloads/singles/python/pingback_reverse_tcp.rb b/modules/payloads/singles/python/pingback_reverse_tcp.rb
index c8a295447f..d5a51186a5 100644
--- a/modules/payloads/singles/python/pingback_reverse_tcp.rb
+++ b/modules/payloads/singles/python/pingback_reverse_tcp.rb
@@ -21,7 +21,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     super.to_s + command_string
   end
 
diff --git a/modules/payloads/singles/python/shell_bind_tcp.rb b/modules/payloads/singles/python/shell_bind_tcp.rb
index 43132ac251..a98eb0b0d4 100644
--- a/modules/payloads/singles/python/shell_bind_tcp.rb
+++ b/modules/payloads/singles/python/shell_bind_tcp.rb
@@ -26,7 +26,7 @@ module MetasploitModule
       ))
   end
 
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/python/shell_reverse_tcp.rb b/modules/payloads/singles/python/shell_reverse_tcp.rb
index 58315e9c9b..59a0282d4e 100644
--- a/modules/payloads/singles/python/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/python/shell_reverse_tcp.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/python/shell_reverse_tcp_ssl.rb b/modules/payloads/singles/python/shell_reverse_tcp_ssl.rb
index e38ed22ee2..3c78cafc60 100644
--- a/modules/payloads/singles/python/shell_reverse_tcp_ssl.rb
+++ b/modules/payloads/singles/python/shell_reverse_tcp_ssl.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/python/shell_reverse_udp.rb b/modules/payloads/singles/python/shell_reverse_udp.rb
index 572d9a35a3..add3913b34 100644
--- a/modules/payloads/singles/python/shell_reverse_udp.rb
+++ b/modules/payloads/singles/python/shell_reverse_udp.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super + command_string
   end
 
diff --git a/modules/payloads/singles/r/shell_bind_tcp.rb b/modules/payloads/singles/r/shell_bind_tcp.rb
index 84aa7db1c8..8e28a2e8c4 100644
--- a/modules/payloads/singles/r/shell_bind_tcp.rb
+++ b/modules/payloads/singles/r/shell_bind_tcp.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return prepends(r_string)
   end
 
diff --git a/modules/payloads/singles/r/shell_reverse_tcp.rb b/modules/payloads/singles/r/shell_reverse_tcp.rb
index 92e5aa3b75..c487631a7a 100644
--- a/modules/payloads/singles/r/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/r/shell_reverse_tcp.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return prepends(r_string)
   end
 
diff --git a/modules/payloads/singles/ruby/pingback_bind_tcp.rb b/modules/payloads/singles/ruby/pingback_bind_tcp.rb
index 451ba1d432..5e3cc62b7c 100644
--- a/modules/payloads/singles/ruby/pingback_bind_tcp.rb
+++ b/modules/payloads/singles/ruby/pingback_bind_tcp.rb
@@ -22,7 +22,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     #return prepends(ruby_string)
     return ruby_string
   end
diff --git a/modules/payloads/singles/ruby/pingback_reverse_tcp.rb b/modules/payloads/singles/ruby/pingback_reverse_tcp.rb
index ab0ac7367c..d7714bc370 100644
--- a/modules/payloads/singles/ruby/pingback_reverse_tcp.rb
+++ b/modules/payloads/singles/ruby/pingback_reverse_tcp.rb
@@ -22,7 +22,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     # return prepends(ruby_string)
     return ruby_string
   end
diff --git a/modules/payloads/singles/ruby/shell_bind_tcp.rb b/modules/payloads/singles/ruby/shell_bind_tcp.rb
index ec0d24b461..f206c87d1c 100644
--- a/modules/payloads/singles/ruby/shell_bind_tcp.rb
+++ b/modules/payloads/singles/ruby/shell_bind_tcp.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return prepends(ruby_string)
   end
 
diff --git a/modules/payloads/singles/ruby/shell_bind_tcp_ipv6.rb b/modules/payloads/singles/ruby/shell_bind_tcp_ipv6.rb
index 734d9a082e..60fe7e78b7 100644
--- a/modules/payloads/singles/ruby/shell_bind_tcp_ipv6.rb
+++ b/modules/payloads/singles/ruby/shell_bind_tcp_ipv6.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return prepends(ruby_string)
   end
 
diff --git a/modules/payloads/singles/ruby/shell_reverse_tcp.rb b/modules/payloads/singles/ruby/shell_reverse_tcp.rb
index 90db98f518..d9619181a4 100644
--- a/modules/payloads/singles/ruby/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/ruby/shell_reverse_tcp.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     return prepends(ruby_string)
   end
 
diff --git a/modules/payloads/singles/ruby/shell_reverse_tcp_ssl.rb b/modules/payloads/singles/ruby/shell_reverse_tcp_ssl.rb
index bd225d4569..a6b5ba6524 100644
--- a/modules/payloads/singles/ruby/shell_reverse_tcp_ssl.rb
+++ b/modules/payloads/singles/ruby/shell_reverse_tcp_ssl.rb
@@ -27,7 +27,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     rbs = prepends(ruby_string)
     vprint_good rbs
     return rbs
diff --git a/modules/payloads/singles/solaris/sparc/shell_bind_tcp.rb b/modules/payloads/singles/solaris/sparc/shell_bind_tcp.rb
index 14801b6e4b..09a7fe0d1b 100644
--- a/modules/payloads/singles/solaris/sparc/shell_bind_tcp.rb
+++ b/modules/payloads/singles/solaris/sparc/shell_bind_tcp.rb
@@ -24,7 +24,7 @@ module MetasploitModule
       'Session'       => Msf::Sessions::CommandShell))
   end
 
-  def generate
+  def generate(_opts = {})
     port    = (datastore['LPORT'] || '0').to_i
     payload =
       "\x9c\x2b\xa0\x07\x98\x10\x20\x01\x96\x1a\xc0\x0b\x94\x1a\xc0\x0b" +
diff --git a/modules/payloads/singles/solaris/sparc/shell_find_port.rb b/modules/payloads/singles/solaris/sparc/shell_find_port.rb
index 38451ad87c..b293642635 100644
--- a/modules/payloads/singles/solaris/sparc/shell_find_port.rb
+++ b/modules/payloads/singles/solaris/sparc/shell_find_port.rb
@@ -24,7 +24,7 @@ module MetasploitModule
       'Session'       => Msf::Sessions::CommandShell))
   end
 
-  def generate
+  def generate(_opts = {})
     port    = (datastore['CPORT'] || '0').to_i
     payload =
       Rex::Arch::Sparc.set(port, "l6") +
diff --git a/modules/payloads/singles/solaris/sparc/shell_reverse_tcp.rb b/modules/payloads/singles/solaris/sparc/shell_reverse_tcp.rb
index 97a739fd33..267cb9a4e4 100644
--- a/modules/payloads/singles/solaris/sparc/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/solaris/sparc/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ module MetasploitModule
     ))
   end
 
-  def generate
+  def generate(_opts = {})
     port    = (datastore['LPORT'] || '0').to_i
     host    = nil
     begin
diff --git a/modules/payloads/singles/windows/dns_txt_query_exec.rb b/modules/payloads/singles/windows/dns_txt_query_exec.rb
index 4d99117f2e..09f18424f6 100644
--- a/modules/payloads/singles/windows/dns_txt_query_exec.rb
+++ b/modules/payloads/singles/windows/dns_txt_query_exec.rb
@@ -57,7 +57,7 @@ module MetasploitModule
   # b.corelan.eu	: contains the next 255 bytes of the alpha shellcode
   # c.corelan.eu	: contains the last 144 bytes of the alpha shellcode
 
-  def generate
+  def generate(_opts = {})
 
     dnsname		= datastore['DNSZONE']
     wType		= 0x0010	#DNS_TYPE_TEXT (TEXT)
diff --git a/modules/payloads/singles/windows/download_exec.rb b/modules/payloads/singles/windows/download_exec.rb
index 466683b170..0a7295d6ef 100644
--- a/modules/payloads/singles/windows/download_exec.rb
+++ b/modules/payloads/singles/windows/download_exec.rb
@@ -34,7 +34,7 @@ module MetasploitModule
   #
   # Construct the payload
   #
-  def generate
+  def generate(_opts = {})
 
     target_uri = datastore['URL'] || ""
     filename = datastore['EXE'] || ""
diff --git a/modules/payloads/singles/windows/format_all_drives.rb b/modules/payloads/singles/windows/format_all_drives.rb
index e5f11c62b8..a43046f1ab 100644
--- a/modules/payloads/singles/windows/format_all_drives.rb
+++ b/modules/payloads/singles/windows/format_all_drives.rb
@@ -56,7 +56,7 @@ module MetasploitModule
       ])
   end
 
-  def generate
+  def generate(_opts = {})
 
     volume_label   = datastore['VOLUMELABEL'] || ""
     encoded_volume_label = volume_label.to_s.unpack("C*").pack("v*")
diff --git a/modules/payloads/singles/windows/loadlibrary.rb b/modules/payloads/singles/windows/loadlibrary.rb
index f27b3a64ab..efe6f9c2a4 100644
--- a/modules/payloads/singles/windows/loadlibrary.rb
+++ b/modules/payloads/singles/windows/loadlibrary.rb
@@ -11,7 +11,7 @@
 ###
 module MetasploitModule
 
-  CachedSize = 230
+  CachedSize = 202
 
   include Msf::Payload::Windows::LoadLibrary
 
diff --git a/modules/payloads/singles/windows/messagebox.rb b/modules/payloads/singles/windows/messagebox.rb
index 8d33d3920a..1b8ea7f983 100644
--- a/modules/payloads/singles/windows/messagebox.rb
+++ b/modules/payloads/singles/windows/messagebox.rb
@@ -36,7 +36,7 @@ module MetasploitModule
   #
   # Construct the payload
   #
-  def generate
+  def generate(_opts = {})
 
     strTitle = datastore['TITLE'] + "X"
     if (strTitle.length < 1)
diff --git a/modules/payloads/singles/windows/pingback_bind_tcp.rb b/modules/payloads/singles/windows/pingback_bind_tcp.rb
index 316d1586bd..f03a724087 100644
--- a/modules/payloads/singles/windows/pingback_bind_tcp.rb
+++ b/modules/payloads/singles/windows/pingback_bind_tcp.rb
@@ -37,7 +37,7 @@ module MetasploitModule
       space
     end
 
-    def generate
+    def generate(_opts = {})
       encoded_port = [datastore['LPORT'].to_i,2].pack("vn").unpack("N").first
       encoded_host = Rex::Socket.addr_aton(datastore['LHOST']||"127.127.127.127").unpack("V").first
       encoded_host_port = "0x%.8x%.8x" % [encoded_host, encoded_port]
diff --git a/modules/payloads/singles/windows/pingback_reverse_tcp.rb b/modules/payloads/singles/windows/pingback_reverse_tcp.rb
index 93910f911f..cf33ec3fbd 100644
--- a/modules/payloads/singles/windows/pingback_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/pingback_reverse_tcp.rb
@@ -40,7 +40,7 @@ module MetasploitModule
       space
     end
 
-    def generate
+    def generate(_opts = {})
       encoded_port = [datastore['LPORT'].to_i, 2].pack('vn').unpack1('N')
       encoded_host = Rex::Socket.addr_aton(datastore['LHOST'] || '127.127.127.127').unpack1('V')
       retry_count = [datastore['ReverseConnectRetries'].to_i, 1].max
diff --git a/modules/payloads/singles/windows/x64/exec.rb b/modules/payloads/singles/windows/x64/exec.rb
index bdeb2d5efc..edeaa7a213 100644
--- a/modules/payloads/singles/windows/x64/exec.rb
+++ b/modules/payloads/singles/windows/x64/exec.rb
@@ -50,7 +50,7 @@ module MetasploitModule
       ])
   end
 
-  def generate
+  def generate(_opts = {})
     return super + command_string + "\x00"
   end
 
diff --git a/modules/payloads/singles/windows/x64/loadlibrary.rb b/modules/payloads/singles/windows/x64/loadlibrary.rb
index a161d9c591..dc1fc45721 100644
--- a/modules/payloads/singles/windows/x64/loadlibrary.rb
+++ b/modules/payloads/singles/windows/x64/loadlibrary.rb
@@ -5,7 +5,7 @@
 
 module MetasploitModule
 
-  CachedSize = 313
+  CachedSize = 285
 
   include Msf::Payload::Windows
   include Msf::Payload::Single
diff --git a/modules/payloads/singles/windows/x64/messagebox.rb b/modules/payloads/singles/windows/x64/messagebox.rb
index b5172cc621..29c2e9aebe 100644
--- a/modules/payloads/singles/windows/x64/messagebox.rb
+++ b/modules/payloads/singles/windows/x64/messagebox.rb
@@ -58,7 +58,7 @@ module MetasploitModule
     return (hash(to_unicode(libname.upcase)) + hash(function)) & 0xffffffff
   end
 
-  def generate
+  def generate(_opts = {})
     style = 0x00
     case datastore['ICON'].upcase.strip
       # default = NO
diff --git a/modules/payloads/singles/windows/x64/pingback_reverse_tcp.rb b/modules/payloads/singles/windows/x64/pingback_reverse_tcp.rb
index ab5fee2e07..0bab292aaa 100644
--- a/modules/payloads/singles/windows/x64/pingback_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/x64/pingback_reverse_tcp.rb
@@ -36,7 +36,7 @@ module MetasploitModule
       space
     end
 
-    def generate
+    def generate(_opts = {})
       # 22 -> "0x00,0x16"
       # 4444 -> "0x11,0x5c"
       encoded_port = [datastore['LPORT'].to_i, 2].pack("vn").unpack("N").first
diff --git a/modules/payloads/stagers/python/reverse_https.rb b/modules/payloads/stagers/python/reverse_https.rb
index 9cffea3543..ad080c7bd0 100644
--- a/modules/payloads/stagers/python/reverse_https.rb
+++ b/modules/payloads/stagers/python/reverse_https.rb
@@ -27,7 +27,7 @@ module MetasploitModule
   #
   # Constructs the payload
   #
-  def generate
+  def generate(_opts = {})
     super({scheme: 'https'})
   end
 end
diff --git a/modules/payloads/stagers/windows/reverse_hop_http.rb b/modules/payloads/stagers/windows/reverse_hop_http.rb
index 88b49abb1b..1dabf00876 100644
--- a/modules/payloads/stagers/windows/reverse_hop_http.rb
+++ b/modules/payloads/stagers/windows/reverse_hop_http.rb
@@ -59,7 +59,7 @@ module MetasploitModule
   #
   # Generate the first stage
   #
-  def generate
+  def generate(_opts = {})
     uri = URI(datastore['HOPURL'])
     #create actual payload
     payload_data = <<EOS
diff --git a/modules/payloads/stagers/windows/reverse_http_proxy_pstore.rb b/modules/payloads/stagers/windows/reverse_http_proxy_pstore.rb
index ed81f049fb..69e55888d3 100644
--- a/modules/payloads/stagers/windows/reverse_http_proxy_pstore.rb
+++ b/modules/payloads/stagers/windows/reverse_http_proxy_pstore.rb
@@ -93,7 +93,7 @@ module MetasploitModule
   #
   # Generate the first stage
   #
-  def generate
+  def generate(_opts = {})
     p = super
     i = p.index("/12345\x00")
     u = generate_uri_uuid_mode(:init_native, 5) + "\x00"
diff --git a/modules/payloads/stagers/windows/reverse_https_proxy.rb b/modules/payloads/stagers/windows/reverse_https_proxy.rb
index 96ee456e6f..abac3140df 100644
--- a/modules/payloads/stagers/windows/reverse_https_proxy.rb
+++ b/modules/payloads/stagers/windows/reverse_https_proxy.rb
@@ -70,7 +70,7 @@ module MetasploitModule
   #
   # Generate the first stage
   #
-  def generate
+  def generate(_opts = {})
     p = super
 
     i = p.index("/12345\x00")
diff --git a/spec/support/shared/examples/payload_cached_size_is_consistent.rb b/spec/support/shared/examples/payload_cached_size_is_consistent.rb
index a01f47e6c6..5e2bd2f91b 100644
--- a/spec/support/shared/examples/payload_cached_size_is_consistent.rb
+++ b/spec/support/shared/examples/payload_cached_size_is_consistent.rb
@@ -86,53 +86,6 @@ RSpec.shared_examples_for 'payload cached size is consistent' do |options|
 
   include_context 'Msf::Simple::Framework#modules loading'
 
-  opts = {
-    'Format'      => 'raw',
-    'Options'     => {
-      'CPORT' => 4444,
-      'LPORT' => 4444,
-      'LHOST' => '255.255.255.255',
-      'KHOST' => '255.255.255.255',
-      'AHOST' => '255.255.255.255',
-      'CMD' => '/bin/sh',
-      'URL' => 'http://a.com',
-      'PATH' => '/',
-      'BUNDLE' => 'data/isight.bundle',
-      'DLL' => 'external/source/byakugan/bin/XPSP2/detoured.dll',
-      'RC4PASSWORD' => 'Metasploit',
-      'DNSZONE' => 'corelan.eu',
-      'PEXEC' => '/bin/sh',
-      'HttpUserAgent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:94.0) Gecko/20100101 Firefox/94.0',
-      'StagerURILength' => 5
-    },
-    'Encoder'     => nil,
-    'DisableNops' => true
-  }
-
-  opts6 = {
-      'Format'      => 'raw',
-      'Options'     => {
-          'CPORT' => 4444,
-          'LPORT' => 4444,
-          'LHOST' => 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff',
-          'KHOST' => 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff',
-          'AHOST' => 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff',
-          'CMD' => '/bin/sh',
-          'URL' => 'http://a.com',
-          'PATH' => '/',
-          'BUNDLE' => 'data/isight.bundle',
-          'DLL' => 'external/source/byakugan/bin/XPSP2/detoured.dll',
-          'RC4PASSWORD' => 'Metasploit',
-          'DNSZONE' => 'corelan.eu',
-          'PEXEC' => '/bin/sh',
-          'HttpUserAgent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:94.0) Gecko/20100101 Firefox/94.0',
-          'StagerURILength' => 5
-      },
-      'Encoder'     => nil,
-      'DisableNops' => true
-  }
-
-
   #
   # lets
   #
@@ -182,11 +135,9 @@ RSpec.shared_examples_for 'payload cached size is consistent' do |options|
         )
         expect(pinst.cached_size).to_not(be_nil)
         expect(pinst.dynamic_size?).to be(false)
-        if pinst.shortname =~ /6/
-          expect(pinst.cached_size).to eq(pinst.generate_simple(opts6).size)
-        else
-          expect(pinst.cached_size).to eq(pinst.generate_simple(opts).size)
-        end
+
+        module_options = Msf::Util::PayloadCachedSize.module_options(pinst)
+        expect(pinst.cached_size).to eq(pinst.generate_simple(module_options).size)
       end
     end
   end
diff --git a/tools/modules/update_payload_cached_sizes.rb b/tools/modules/update_payload_cached_sizes.rb
index 54fd68ab22..8df4011002 100755
--- a/tools/modules/update_payload_cached_sizes.rb
+++ b/tools/modules/update_payload_cached_sizes.rb
@@ -31,17 +31,13 @@ framework.payloads.each_module do |name, mod|
     next if name =~ /generic/
     mod_inst = framework.payloads.create(name)
     #mod_inst.datastore.merge!(framework.datastore)
-    next if Msf::Util::PayloadCachedSize.is_cached_size_accurate?(mod_inst)
+    next if mod_inst.is_a?(Msf::Payload::Adapter) || Msf::Util::PayloadCachedSize.is_cached_size_accurate?(mod_inst)
     $stdout.puts "[*] Updating the CacheSize for #{mod.file_path}..."
     Msf::Util::PayloadCachedSize.update_module_cached_size(mod_inst)
   rescue => e
+    $stderr.puts "[!] Caught Error while updating #{name}:\n#{e}\n#{e.backtrace.map { |line| "\t#{line}" }.join("\n")}"
     exceptions << [ e, name ]
-    next
   end
 end
 
-exceptions.each do |e, name|
-  print_error("Caught Error while updating #{name}:\n#{e}")
-  elog(e)
-end
 exit(1) unless exceptions.empty?