diff --git a/lib/common/collections/wp_items/detectable.rb b/lib/common/collections/wp_items/detectable.rb
index e0a0e252..f67b143b 100755
--- a/lib/common/collections/wp_items/detectable.rb
+++ b/lib/common/collections/wp_items/detectable.rb
@@ -143,28 +143,16 @@ class WpItems < Array
     def vulnerable_targets_items(wp_target, item_class, vulns_file)
       targets = []
       json    = json(vulns_file)
-      # xml     = xml(vulns_file)
 
-      unless json.nil? || json == ''
-        json.each do |item|
-          targets << create_item(
-            item_class,
-            item.keys.inject,
-            wp_target,
-            vulns_file
-          )
-        end
+      [*json].each do |item|
+        targets << create_item(
+          item_class,
+          item.keys.inject,
+          wp_target,
+          vulns_file
+        )
       end
 
-      # xml.xpath(item_xpath).each do |node|
-      #   targets << create_item(
-      #     item_class,
-      #     node.attribute('name').text,
-      #     wp_target,
-      #     vulns_file
-      #   )
-      # end
-
       targets
     end
 
diff --git a/lib/common/models/vulnerability.rb b/lib/common/models/vulnerability.rb
index 8187ef1f..f7c4a3ce 100755
--- a/lib/common/models/vulnerability.rb
+++ b/lib/common/models/vulnerability.rb
@@ -35,32 +35,6 @@ class Vulnerability
   end
   # :nocov:
 
-  # Create the Vulnerability from the xml_node
-  #
-  # @param [ Nokogiri::XML::Node ] xml_node
-  #
-  # @return [ Vulnerability ]
-  # def self.load_from_xml_node(xml_node)
-  #   references = {}
-  #   refs = xml_node.search('references')
-
-  #   if refs
-  #     references[:url] = refs.search('url').map(&:text)
-  #     references[:cve] = refs.search('cve').map(&:text)
-  #     references[:secunia] = refs.search('secunia').map(&:text)
-  #     references[:osvdb] = refs.search('osvdb').map(&:text)
-  #     references[:metasploit] = refs.search('metasploit').map(&:text)
-  #     references[:exploitdb] = refs.search('exploitdb').map(&:text)
-  #   end
-
-  #   new(
-  #     xml_node.search('title').text,
-  #     xml_node.search('type').text,
-  #     references,
-  #     xml_node.search('fixed_in').text,
-  #   )
-  # end
-
   # Create the Vulnerability from the json_item
   #
   # @param [ Hash ] json_item
@@ -69,12 +43,9 @@ class Vulnerability
   def self.load_from_json_item(json_item)
     references = {}
 
-    references[:url]        = json_item['references'].split(',') if json_item['references']
-    references[:cve]        = json_item['cve'].split(',') if json_item['cve']
-    references[:secunia]    = json_item['secunia'].split(',') if json_item['secunia']
-    references[:osvdb]      = json_item['osvdb'].split(',') if json_item['osvdb']
-    references[:metasploit] = json_item['metasploit'].split(',') if json_item['metasploit']
-    references[:exploitdb]  = json_item['exploitdb'].split(',') if json_item['exploitdb']
+    [:url, :cve, :secunia, :osvdb, :metasploit, :exploitdb].each do |key|
+      references[key] = json_item[key.to_s].split(',') if json_item[key.to_s]
+    end
 
     new(
       json_item['title'],
diff --git a/lib/common/models/wp_item/vulnerable.rb b/lib/common/models/wp_item/vulnerable.rb
index 9314804c..0c5f733b 100755
--- a/lib/common/models/wp_item/vulnerable.rb
+++ b/lib/common/models/wp_item/vulnerable.rb
@@ -9,7 +9,6 @@ class WpItem
     #
     # @return [ Vulnerabilities ]
     def vulnerabilities
-      # xml             = xml(vulns_file)
       json            = json(vulns_file)
       vulnerabilities = Vulnerabilities.new
 
@@ -24,13 +23,6 @@ class WpItem
         end
       end
 
-      # xml.xpath(vulns_xpath).each do |node|
-      #   vuln = Vulnerability.load_from_xml_node(node)
-      #   if vulnerable_to?(vuln)
-      #     vulnerabilities << vuln
-      #   end
-      # end
-
       vulnerabilities
     end
 
@@ -55,4 +47,9 @@ class WpItem
     end
   end
 
+  # @return [ String ]
+  def identifier
+    @name
+  end
+
 end
diff --git a/lib/common/models/wp_plugin/vulnerable.rb b/lib/common/models/wp_plugin/vulnerable.rb
index d3b25822..6c3bdba0 100644
--- a/lib/common/models/wp_plugin/vulnerable.rb
+++ b/lib/common/models/wp_plugin/vulnerable.rb
@@ -11,15 +11,5 @@ class WpPlugin < WpItem
       @vulns_file
     end
 
-    # @return [ String ]
-    def identifier
-      @name
-    end
-
-    # # @return [ String ]
-    # def vulns_xpath
-    #   "//plugin[@name='#{@name}']/vulnerability"
-    # end
-
   end
 end
diff --git a/lib/common/models/wp_theme/vulnerable.rb b/lib/common/models/wp_theme/vulnerable.rb
index d9c1f4a7..12a2db2f 100644
--- a/lib/common/models/wp_theme/vulnerable.rb
+++ b/lib/common/models/wp_theme/vulnerable.rb
@@ -10,16 +10,6 @@ class WpTheme < WpItem
       end
       @vulns_file
     end
-
-    # @return [ String ]
-    def identifier
-      @name
-    end    
-
-    # @return [ String ]
-    # def vulns_xpath
-    #   "//theme[@name='#{@name}']/vulnerability"
-    # end
-
+    
   end
 end