diff --git a/lib/msf/core/exploit/mixins.rb b/lib/msf/core/exploit/mixins.rb
index 4bda434584..76cfac86e4 100644
--- a/lib/msf/core/exploit/mixins.rb
+++ b/lib/msf/core/exploit/mixins.rb
@@ -88,3 +88,6 @@ require 'msf/core/exploit/java'
 # WBEM
 require 'msf/core/exploit/wbemexec'
 
+#WinRM
+require 'msf/core/exploit/winrm'
+
diff --git a/lib/msf/core/exploit/winrm.rb b/lib/msf/core/exploit/winrm.rb
index e793f02cd1..ca76bfcb4a 100644
--- a/lib/msf/core/exploit/winrm.rb
+++ b/lib/msf/core/exploit/winrm.rb
@@ -36,38 +36,6 @@ module Msf
         ], self.class
       )
 
-      register_advanced_options(
-        [
-          OptString.new('UserAgent', [false, 'The User-Agent header to use for all requests',
-            Rex::Proto::Http::Client::DefaultUserAgent
-            ]),
-        ], self.class
-      )
-
-      register_evasion_options(
-        [
-          OptEnum.new('HTTP::uri_encode_mode', [false, 'Enable URI encoding', 'hex-normal', ['none', 'hex-normal', 'hex-all', 'hex-random', 'u-normal', 'u-all', 'u-random']]),
-          OptBool.new('HTTP::uri_full_url', [false, 'Use the full URL for all HTTP requests', false]),
-          OptInt.new('HTTP::pad_method_uri_count', [false, 'How many whitespace characters to use between the method and uri', 1]),
-          OptInt.new('HTTP::pad_uri_version_count', [false, 'How many whitespace characters to use between the uri and version', 1]),
-          OptEnum.new('HTTP::pad_method_uri_type', [false, 'What type of whitespace to use between the method and uri', 'space', ['space', 'tab', 'apache']]),
-          OptEnum.new('HTTP::pad_uri_version_type', [false, 'What type of whitespace to use between the uri and version', 'space', ['space', 'tab', 'apache']]),
-          OptBool.new('HTTP::method_random_valid', [false, 'Use a random, but valid, HTTP method for request', false]),
-          OptBool.new('HTTP::method_random_invalid', [false, 'Use a random invalid, HTTP method for request', false]),
-          OptBool.new('HTTP::method_random_case', [false, 'Use random casing for the HTTP method', false]),
-          OptBool.new('HTTP::uri_dir_self_reference', [false, 'Insert self-referential directories into the uri', false]),
-          OptBool.new('HTTP::uri_dir_fake_relative', [false, 'Insert fake relative directories into the uri', false]),
-          OptBool.new('HTTP::uri_use_backslashes', [false, 'Use back slashes instead of forward slashes in the uri ', false]),
-          OptBool.new('HTTP::pad_fake_headers', [false, 'Insert random, fake headers into the HTTP request', false]),
-          OptInt.new('HTTP::pad_fake_headers_count', [false, 'How many fake headers to insert into the HTTP request', 0]),
-          OptBool.new('HTTP::pad_get_params', [false, 'Insert random, fake query string variables into the request', false]),
-          OptInt.new('HTTP::pad_get_params_count', [false, 'How many fake query string variables to insert into the request', 16]),
-          OptBool.new('HTTP::pad_post_params', [false, 'Insert random, fake post variables into the request', false]),
-          OptInt.new('HTTP::pad_post_params_count', [false, 'How many fake post variables to insert into the request', 16]),
-          OptBool.new('HTTP::uri_fake_end', [false, 'Add a fake end of URI (eg: /%20HTTP/1.0/../../)', false]),
-          OptBool.new('HTTP::uri_fake_params_start', [false, 'Add a fake start of params to the URI (eg: /%3fa=b/../)', false]),
-          OptBool.new('HTTP::header_folding', [false, 'Enable folding of HTTP headers', false])
-        ], self.class)
 
       register_autofilter_ports([ 80,443,5985,5986 ])
       register_autofilter_services(%W{ winrm })
diff --git a/modules/auxiliary/scanner/winrm/winrm_auth_methods.rb b/modules/auxiliary/scanner/winrm/winrm_auth_methods.rb
index c56af6c0ce..9de14a96b8 100644
--- a/modules/auxiliary/scanner/winrm/winrm_auth_methods.rb
+++ b/modules/auxiliary/scanner/winrm/winrm_auth_methods.rb
@@ -34,11 +34,6 @@ class Metasploit3 < Msf::Auxiliary
 			'License'        => MSF_LICENSE
 		)
 
-		register_options(
-			[
-				OptString.new('URI', [ true, "The URI of the WinRM service", "/wsman" ])
-			], self.class)
-
 		deregister_options('USERNAME', 'PASSWORD')
 
 	end