diff --git a/lib/msf/core/auxiliary/redis.rb b/lib/msf/core/auxiliary/redis.rb
index 58412d3330..20714c8eb3 100644
--- a/lib/msf/core/auxiliary/redis.rb
+++ b/lib/msf/core/auxiliary/redis.rb
@@ -31,10 +31,6 @@ module Msf
       )
     end
 
-    def peer
-      "#{rhost}:#{rport}"
-    end
-
     def read_timeout
       datastore['READ_TIMEOUT']
     end
diff --git a/lib/msf/core/exploit/java/rmi/client.rb b/lib/msf/core/exploit/java/rmi/client.rb
index 11e6876253..7f8a04560d 100644
--- a/lib/msf/core/exploit/java/rmi/client.rb
+++ b/lib/msf/core/exploit/java/rmi/client.rb
@@ -51,12 +51,6 @@ module Msf
               datastore['RPORT']
             end
 
-            # Returns the RMI server peer
-            #
-            # @return [String]
-            def peer
-              "#{rhost}:#{rport}"
-            end
 
             # Sends a RMI header stream
             #
diff --git a/lib/msf/core/exploit/tcp.rb b/lib/msf/core/exploit/tcp.rb
index 13c0a7f6ac..f4a6daef6c 100644
--- a/lib/msf/core/exploit/tcp.rb
+++ b/lib/msf/core/exploit/tcp.rb
@@ -82,6 +82,11 @@ module Exploit::Remote::Tcp
     )
   end
 
+  # Returns the rhost:rport
+  def peer
+    "#{rhost}:#{rport}"
+  end
+
   #
   # Establishes a TCP connection to the specified RHOST/RPORT
   #
diff --git a/modules/auxiliary/admin/atg/atg_client.rb b/modules/auxiliary/admin/atg/atg_client.rb
index 9962d57c5b..5560f2f76d 100644
--- a/modules/auxiliary/admin/atg/atg_client.rb
+++ b/modules/auxiliary/admin/atg/atg_client.rb
@@ -190,10 +190,6 @@ class Metasploit3 < Msf::Auxiliary
     response
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def protocol
     datastore['PROTOCOL']
   end
diff --git a/modules/auxiliary/admin/misc/sercomm_dump_config.rb b/modules/auxiliary/admin/misc/sercomm_dump_config.rb
index 84979820e9..0ef51aa38a 100644
--- a/modules/auxiliary/admin/misc/sercomm_dump_config.rb
+++ b/modules/auxiliary/admin/misc/sercomm_dump_config.rb
@@ -134,9 +134,6 @@ class Metasploit3 < Msf::Auxiliary
     return nil
   end
 
-  def peer
-    return "#{rhost}:#{rport}"
-  end
 
   def fingerprint_endian
     begin
diff --git a/modules/auxiliary/admin/smb/delete_file.rb b/modules/auxiliary/admin/smb/delete_file.rb
index 2a17e475ae..417aea54d2 100644
--- a/modules/auxiliary/admin/smb/delete_file.rb
+++ b/modules/auxiliary/admin/smb/delete_file.rb
@@ -40,10 +40,6 @@ class Metasploit3 < Msf::Auxiliary
     ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def smb_delete_files
     vprint_status("#{peer}: Connecting to the server...")
     connect()
diff --git a/modules/auxiliary/admin/smb/download_file.rb b/modules/auxiliary/admin/smb/download_file.rb
index 5aca3e917b..d6aa05a4b6 100644
--- a/modules/auxiliary/admin/smb/download_file.rb
+++ b/modules/auxiliary/admin/smb/download_file.rb
@@ -40,10 +40,6 @@ class Metasploit3 < Msf::Auxiliary
     ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def smb_download
     vprint_status("#{peer}: Connecting...")
     connect()
diff --git a/modules/auxiliary/admin/smb/upload_file.rb b/modules/auxiliary/admin/smb/upload_file.rb
index 523bbddfa1..b52f54f8a1 100644
--- a/modules/auxiliary/admin/smb/upload_file.rb
+++ b/modules/auxiliary/admin/smb/upload_file.rb
@@ -47,10 +47,6 @@ class Metasploit3 < Msf::Auxiliary
 
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def run_host(_ip)
     begin
       vprint_status("#{peer}: Connecting to the server...")
diff --git a/modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb b/modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb
index f434560054..c6f8a24995 100644
--- a/modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb
+++ b/modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb
@@ -116,10 +116,6 @@ class Metasploit3 < Msf::Auxiliary
 
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def dos_user
     length = 12000 # enough to overflow the end of allocated memory
     msg = create_message(length)
diff --git a/modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb b/modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb
index 5c56b1553f..405e6e1851 100644
--- a/modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb
+++ b/modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb
@@ -42,10 +42,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def get_response(size = 72)
     connect
     response = sock.get_once(size)
diff --git a/modules/auxiliary/scanner/elasticsearch/indices_enum.rb b/modules/auxiliary/scanner/elasticsearch/indices_enum.rb
index 7624c9f7d9..1dca83d949 100644
--- a/modules/auxiliary/scanner/elasticsearch/indices_enum.rb
+++ b/modules/auxiliary/scanner/elasticsearch/indices_enum.rb
@@ -31,10 +31,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def run_host(ip)
     vprint_status("#{peer} - Querying indices...")
     begin
diff --git a/modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb b/modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
index 6811cbedd5..6644b0b7d4 100644
--- a/modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
+++ b/modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
@@ -36,10 +36,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def extract_words(wordfile)
     return [] unless wordfile && File.readable?(wordfile)
     begin
diff --git a/modules/auxiliary/scanner/rdp/ms12_020_check.rb b/modules/auxiliary/scanner/rdp/ms12_020_check.rb
index 716f2622db..d9fca848d7 100644
--- a/modules/auxiliary/scanner/rdp/ms12_020_check.rb
+++ b/modules/auxiliary/scanner/rdp/ms12_020_check.rb
@@ -124,9 +124,6 @@ class Metasploit3 < Msf::Auxiliary
     "\x02\xf0\x80\x38"
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
 
   def check_rdp_vuln
     # check if rdp is open
diff --git a/modules/auxiliary/scanner/rsync/modules_list.rb b/modules/auxiliary/scanner/rsync/modules_list.rb
index ab198bbad6..37584933e1 100644
--- a/modules/auxiliary/scanner/rsync/modules_list.rb
+++ b/modules/auxiliary/scanner/rsync/modules_list.rb
@@ -56,10 +56,6 @@ class Metasploit3 < Msf::Auxiliary
     )
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def read_timeout
     datastore['READ_TIMEOUT']
   end
diff --git a/modules/auxiliary/scanner/ssh/ssh_version.rb b/modules/auxiliary/scanner/ssh/ssh_version.rb
index 4292689896..5371196d34 100644
--- a/modules/auxiliary/scanner/ssh/ssh_version.rb
+++ b/modules/auxiliary/scanner/ssh/ssh_version.rb
@@ -37,10 +37,6 @@ class Metasploit3 < Msf::Auxiliary
     )
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def timeout
     datastore['TIMEOUT'] <= 0 ? DEFAULT_TIMEOUT : datastore['TIMEOUT']
   end
diff --git a/modules/auxiliary/scanner/ssl/openssl_ccs.rb b/modules/auxiliary/scanner/ssl/openssl_ccs.rb
index 79b0bb86d1..69f1e4cfa4 100644
--- a/modules/auxiliary/scanner/ssl/openssl_ccs.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_ccs.rb
@@ -111,10 +111,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def response_timeout
     datastore['RESPONSE_TIMEOUT']
   end
diff --git a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
index 07bc61c836..6d1a466b31 100644
--- a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
@@ -170,10 +170,6 @@ class Metasploit3 < Msf::Auxiliary
 
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   #
   # Main methods
   #
diff --git a/modules/exploits/linux/http/nginx_chunked_size.rb b/modules/exploits/linux/http/nginx_chunked_size.rb
index b588bb1053..be5ae4c9c3 100644
--- a/modules/exploits/linux/http/nginx_chunked_size.rb
+++ b/modules/exploits/linux/http/nginx_chunked_size.rb
@@ -33,7 +33,7 @@ class Metasploit4 < Msf::Exploit::Remote
           ['CVE', '2013-2028'],
           ['OSVDB', '93037'],
           ['URL', 'http://nginx.org/en/security_advisories.html'],
-          ['URL', 'http://packetstormsecurity.com/files/121560/Nginx-1.3.9-1.4.0-Stack-Buffer-Overflow.html']
+          ['PACKETSTORM', '121560']
         ],
       'Privileged'     => false,
       'Payload'        =>
@@ -73,9 +73,6 @@ class Metasploit4 < Msf::Exploit::Remote
 
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
 
   def check
     begin
diff --git a/modules/exploits/linux/misc/jenkins_java_deserialize.rb b/modules/exploits/linux/misc/jenkins_java_deserialize.rb
index 96a79dce1d..c7eec77106 100644
--- a/modules/exploits/linux/misc/jenkins_java_deserialize.rb
+++ b/modules/exploits/linux/misc/jenkins_java_deserialize.rb
@@ -54,10 +54,6 @@ class Metasploit3 < Msf::Exploit::Remote
     ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def exploit
     unless vulnerable?
       fail_with(Failure::Unknown, "#{peer} - Jenkins is not vulnerable, aborting...")
diff --git a/modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb b/modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb
index 6b1141fcc2..c6861a0ea3 100644
--- a/modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb
+++ b/modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb
@@ -129,10 +129,6 @@ class Metasploit3 < Msf::Exploit::Remote
     end
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def build_pkt(fields)
     data = "\xff\xfe" # BOM Unicode
     fields.each do |v|
diff --git a/modules/exploits/multi/misc/java_jdwp_debugger.rb b/modules/exploits/multi/misc/java_jdwp_debugger.rb
index a01e067e78..3bd4d88285 100644
--- a/modules/exploits/multi/misc/java_jdwp_debugger.rb
+++ b/modules/exploits/multi/misc/java_jdwp_debugger.rb
@@ -147,10 +147,6 @@ class Metasploit3 < Msf::Exploit::Remote
   end
 
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def default_timeout
     datastore['RESPONSE_TIMEOUT']
   end
diff --git a/modules/exploits/multi/misc/java_rmi_server.rb b/modules/exploits/multi/misc/java_rmi_server.rb
index 128be9b71c..90f87dea99 100644
--- a/modules/exploits/multi/misc/java_rmi_server.rb
+++ b/modules/exploits/multi/misc/java_rmi_server.rb
@@ -106,10 +106,6 @@ class Metasploit3 < Msf::Exploit::Remote
     end
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def primer
     connect
 
diff --git a/modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb b/modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb
index a2f4c18ba6..b8fc3c811f 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb
@@ -87,9 +87,6 @@ class Metasploit3 < Msf::Exploit::Remote
     Exploit::CheckCode::Detected
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
 
   def get_fingerprint
     ommni = connect
diff --git a/modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb b/modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb
index 81c51a11fd..cfa69e5d2f 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb
@@ -105,9 +105,6 @@ class Metasploit3 < Msf::Exploit::Remote
     end
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
 
   def build_pkt(fields)
     data = "\xff\xfe" # BOM Unicode
diff --git a/modules/exploits/windows/misc/hp_dataprotector_traversal.rb b/modules/exploits/windows/misc/hp_dataprotector_traversal.rb
index ce3ff71b99..b43d9af842 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_traversal.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_traversal.rb
@@ -101,10 +101,6 @@ class Metasploit3 < Msf::Exploit::Remote
     register_file_for_cleanup("wbem\\mof\\good\\#{mof_name}")
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def build_pkt(fields)
     data = "\xff\xfe" # BOM Unicode
     fields.each do |v|
diff --git a/modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb b/modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb
index 6143ce46ef..b2a11ea670 100644
--- a/modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb
+++ b/modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb
@@ -66,10 +66,6 @@ class Metasploit3 < Msf::Exploit::Remote
     ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   #
   # Check
   #