diff --git a/lib/wpscan/wpscan_options.rb b/lib/wpscan/wpscan_options.rb
index e831ecd7..d09cd1d4 100644
--- a/lib/wpscan/wpscan_options.rb
+++ b/lib/wpscan/wpscan_options.rb
@@ -45,12 +45,7 @@ class WpscanOptions
   attr_accessor *ACCESSOR_OPTIONS
 
   def initialize
-    @enumerate_plugins = false
-    @enumerate_themes = false
-    @enumerate_only_vulnerable_plugins = false
-    @enumerate_only_vulnerable_themes = false
-    @enumerate_timthumbs = false
-    @enumerate_usernames = false
+
   end
 
   def url=(url)
diff --git a/wpscan.rb b/wpscan.rb
index fb669e10..f105b36f 100755
--- a/wpscan.rb
+++ b/wpscan.rb
@@ -181,7 +181,7 @@ begin
 
     options = WpOptions.get_empty_options
     options[:url]                   = wp_target.uri
-    options[:only_vulnerable_ones]  = wpscan_options.enumerate_only_vulnerable_plugins
+    options[:only_vulnerable_ones]  = wpscan_options.enumerate_only_vulnerable_plugins || false
     options[:show_progress_bar]     = true
     options[:wp_content_dir]        = wp_target.wp_content_dir
     options[:error_404_hash]        = wp_target.error_404_hash
@@ -233,7 +233,7 @@ begin
 
     options = WpOptions.get_empty_options
     options[:url]                   = wp_target.uri
-    options[:only_vulnerable_ones]  = wpscan_options.enumerate_only_vulnerable_themes
+    options[:only_vulnerable_ones]  = wpscan_options.enumerate_only_vulnerable_themes || false
     options[:show_progress_bar]     = true
     options[:wp_content_dir]        = wp_target.wp_content_dir
     options[:error_404_hash]        = wp_target.error_404_hash