diff --git a/includes/discovery/cisco-processors.inc.php b/includes/discovery/cisco-processors.inc.php
index 5380081dc..582a8d799 100755
--- a/includes/discovery/cisco-processors.inc.php
+++ b/includes/discovery/cisco-processors.inc.php
@@ -53,12 +53,4 @@ while ($test_cpm = mysql_fetch_array($query)) {
 unset($valid_cpm);
 echo("\n");
 
-
-##### ************FIX ME***************** 
-##### WRITE CODE TO REMOVE OLD PROCESSORS
-##### SOMETIMES CPUS FALL OUT, DONT THEY?
-##### ***********************************
-
-echo("\n");
-
 ?>
diff --git a/includes/functions.php b/includes/functions.php
index 12c9a4fed..a24b4abaf 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -56,12 +56,6 @@ function only_alphanumeric( $string )
   return preg_replace('/[^a-zA-Z0-9]/', '', $string);
 }
 
-
-function validate_hostip($host)
-{
-  // FIXME
-}
-
 function write_dev_attrib($device_id, $attrib_type, $attrib_value)
 {
   $count_sql = "SELECT COUNT(*) FROM devices_attribs WHERE `device_id` = '" . $device_id . "' AND `attrib_type` = '$attrib_type'";
diff --git a/includes/polling/storage.inc.php b/includes/polling/storage.inc.php
index 56c801973..1e4381321 100755
--- a/includes/polling/storage.inc.php
+++ b/includes/polling/storage.inc.php
@@ -32,7 +32,7 @@ while($storage = mysql_fetch_array($storage_data)) {
   if(is_file($file)) {
     include($file);
   } else {
-    ### FIXME GENERIC
+    ### Generic poller goes here if we ever have a discovery module which uses it.
   }
 
   if($debug) {print_r($storage);}