diff --git a/lib/msf/core/exploit.rb b/lib/msf/core/exploit.rb
index f6ef635e4c..0dbbf4bee9 100644
--- a/lib/msf/core/exploit.rb
+++ b/lib/msf/core/exploit.rb
@@ -99,20 +99,6 @@ class Exploit < Msf::Module
 		CheckCode::Unsupported
 	end
 
-	#
-	# Attempts to automatically select the target for exploitation.  If the
-	# target can be automatically determined, the appropriate target will be
-	# returned, otherwise nil is returned if the target cannot be automatically
-	# determined.
-	#
-	# If an exploit module establishes a connection that can stay open past the
-	# auto targetting phase, it can persist it as a class attribute and
-	# reference it when the exploit is actually run.  The auto_target routine
-	# is only called if no target is specified.
-	#
-	def auto_target
-	end
-
 	#
 	# Kicks off the actual exploit.  Prior to this call, the framework will
 	# have validated the data store using the options associated with this
@@ -137,10 +123,6 @@ class Exploit < Msf::Module
 		derived_implementor?(Msf::Exploit, 'check')
 	end
 
-	def supports_auto_target?
-		derived_implementor?(Msf::Exploit, 'auto_target')
-	end
-	
 	def supports_exploit?
 		derived_implementor?(Msf::Exploit, 'exploit')
 	end
@@ -151,7 +133,6 @@ class Exploit < Msf::Module
 	def capabilities
 		{
 			'check'       => supports_check?,
-			'auto_target' => supports_auto_target?,
 			'exploit'     => supports_exploit?
 		}
 	end