diff --git a/includes/osdiscovery/3com.inc.php b/includes/osdiscovery/3com.inc.php
deleted file mode 100644
index 19c3ff6c77..0000000000
--- a/includes/osdiscovery/3com.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "3Com Switch ")) { $os = "3com"; }
-  else if(strstr($sysDescr, "3Com SuperStack")) { $os = "3com"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/airport.inc.php b/includes/osdiscovery/airport.inc.php
deleted file mode 100644
index 5dbd65a043..0000000000
--- a/includes/osdiscovery/airport.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strpos($sysDescr, "Apple AirPort") !== FALSE) { $os = "airport"; }
-  else if(strpos($sysDescr, "Apple Base Station") !== FALSE) { $os = "airport"; }
-  else if(strpos($sysDescr, "Base Station V3.84") !== FALSE) { $os = "airport"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/akcp.inc.php b/includes/osdiscovery/akcp.inc.php
deleted file mode 100644
index 7bd573e188..0000000000
--- a/includes/osdiscovery/akcp.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/8VD-X20/", $sysDescr)) { $os = "minkelsrms"; }
-  if (preg_match("/SensorProbe/i", $sysDescr)) { $os = "akcp"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/allied.inc.php b/includes/osdiscovery/allied.inc.php
deleted file mode 100755
index 803377c440..0000000000
--- a/includes/osdiscovery/allied.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.207")) { $os = "allied"; }
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.207.1.4.126")) { unset($os);  }
-
-}
-
-?>
diff --git a/includes/osdiscovery/apc.inc.php b/includes/osdiscovery/apc.inc.php
deleted file mode 100644
index aee6b3eb16..0000000000
--- a/includes/osdiscovery/apc.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
-  else if(strstr($sysDescr, "APC Switched Rack PDU")) { $os = "apc"; }
-  else if(strstr($sysDescr, "APC MasterSwitch PDU")) { $os = "apc"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/areca.inc.php b/includes/osdiscovery/areca.inc.php
deleted file mode 100755
index fe86346e35..0000000000
--- a/includes/osdiscovery/areca.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Raid Subsystem V")) { $os = "areca"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/asa.inc.php b/includes/osdiscovery/asa.inc.php
deleted file mode 100755
index fcec461c98..0000000000
--- a/includes/osdiscovery/asa.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(!$os) {
-  if(preg_match("/^Cisco\ Adaptive\ Security\ Appliance/", $sysDescr)) { $os = "asa"; }
-}
-
-?>
diff --git a/includes/osdiscovery/axiscam.inc.php b/includes/osdiscovery/axiscam.inc.php
deleted file mode 100644
index b366fb9e98..0000000000
--- a/includes/osdiscovery/axiscam.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/AXIS.*Network Camera/", $sysDescr)) { $os = "axiscam"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/axisdocserver.inc.php b/includes/osdiscovery/axisdocserver.inc.php
deleted file mode 100644
index e1b9bbd3b5..0000000000
--- a/includes/osdiscovery/axisdocserver.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/^AXIS .* Network Document Server/", $sysDescr)) { $os = "axisdocserver"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/bcm963.inc.php b/includes/osdiscovery/bcm963.inc.php
deleted file mode 100644
index bf69985551..0000000000
--- a/includes/osdiscovery/bcm963.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(stripos($sysDescr, "bcm963") !== FALSE) { $os = "bcm963"; }
-
-}
-
-
-?>
diff --git a/includes/osdiscovery/brother.inc.php b/includes/osdiscovery/brother.inc.php
deleted file mode 100644
index 352554a4d7..0000000000
--- a/includes/osdiscovery/brother.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/Brother NC-.*h,/", $sysDescr)) { $os = "brother"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/cat1900.inc.php b/includes/osdiscovery/cat1900.inc.php
deleted file mode 100755
index ddcab4448b..0000000000
--- a/includes/osdiscovery/cat1900.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Cisco Systems Catalyst 1900")) { $os = "cat1900"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/catos.inc.php b/includes/osdiscovery/catos.inc.php
deleted file mode 100755
index 62c639a816..0000000000
--- a/includes/osdiscovery/catos.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Cisco Catalyst Operating System Software")) { $os = "catos"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/dell-laser.inc.php b/includes/osdiscovery/dell-laser.inc.php
deleted file mode 100644
index 6b4d3f5cf7..0000000000
--- a/includes/osdiscovery/dell-laser.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Dell Color Laser")) { $os = "dell-laser"; }
-  elseif(strstr($sysDescr, "Dell Laser Printer")) { $os = "dell-laser"; }
-  elseif(preg_match("/^Dell.*MFP/", $sysDescr)) { $os = "dell-laser"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/dlink.inc.php b/includes/osdiscovery/dlink.inc.php
deleted file mode 100644
index d5852fc3c7..0000000000
--- a/includes/osdiscovery/dlink.inc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/D-Link DES-/", $sysDescr)) { $os = "dlink"; }
-  else if (preg_match("/Dlink DES-/", $sysDescr)) { $os = "dlink"; }
-  else if (preg_match("/^DES-/", $sysDescr)) { $os = "dlink"; }
-  else if (preg_match("/^DGS-/", $sysDescr)) { $os = "dlink"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/dlinkap.inc.php b/includes/osdiscovery/dlinkap.inc.php
deleted file mode 100644
index 4e907e6340..0000000000
--- a/includes/osdiscovery/dlinkap.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/D-Link .* AP/", $sysDescr)) { $os = "dlinkap"; }
-  else if (preg_match("/D-Link Access Point/", $sysDescr)) { $os = "dlinkap"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/drac.inc.php b/includes/osdiscovery/drac.inc.php
deleted file mode 100644
index 82e24cf0f5..0000000000
--- a/includes/osdiscovery/drac.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Dell Out-of-band SNMP Agent for Remote Access Controller")) { $os = "drac"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/extremeware.inc.php b/includes/osdiscovery/extremeware.inc.php
deleted file mode 100755
index 7fa4be1265..0000000000
--- a/includes/osdiscovery/extremeware.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.1916.2")) { $os = "extremeware"; }
-  if(strstr($sysDescr, "XOS")) { $os = "xos"; }
-
-
-}
-
-?>
diff --git a/includes/osdiscovery/fortigate.inc.php b/includes/osdiscovery/fortigate.inc.php
deleted file mode 100755
index 99ceb8011a..0000000000
--- a/includes/osdiscovery/fortigate.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-  $fnSysVersion = snmp_get($device, "1.3.6.1.4.1.12356.1.3.0", "-Ovq");
-  if(strstr($fnSysVersion, "Fortigate")) {
-    $os = "fortigate"; 
-  }
-}
-
-?>
diff --git a/includes/osdiscovery/freebsd.inc.php b/includes/osdiscovery/freebsd.inc.php
deleted file mode 100755
index 34bed8bfa1..0000000000
--- a/includes/osdiscovery/freebsd.inc.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(!$os) {
-  if(strstr($sysDescr, "FreeBSD")) { $os = "freebsd"; }    ## It's FreeBSD!
-  if(strstr($sysDescr, "Voswall")) { $os = "voswall"; }    ## Oh-No-It-Isn't!!
-  if(strstr($sysDescr, "m0n0wall")) { $os = "monowall"; }  ## Ditto
-}
-?>
diff --git a/includes/osdiscovery/ftos.inc.php b/includes/osdiscovery/ftos.inc.php
deleted file mode 100755
index fa5708da2e..0000000000
--- a/includes/osdiscovery/ftos.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Force10 Operating System")) { $os = "ftos"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/gamatronicups.inc.php b/includes/osdiscovery/gamatronicups.inc.php
deleted file mode 100644
index ddf61aaba0..0000000000
--- a/includes/osdiscovery/gamatronicups.inc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(!$os) {
-
-       if ($sysDescr == "") {
-               if (snmp_get($device, "GAMATRONIC-MIB::psUnitManufacture.0", "-Oqv", "") == "Gamatronic") {
-                       $os = "gamatronicups";
-               }
-       }
-}
-
-?>
diff --git a/includes/osdiscovery/ies.inc.php b/includes/osdiscovery/ies.inc.php
deleted file mode 100644
index de24b56a4f..0000000000
--- a/includes/osdiscovery/ies.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strpos($sysDescr, "IES-") !== FALSE) { $os = "ies"; }
-
-}
-
-
-?>
diff --git a/includes/osdiscovery/ios.inc.php b/includes/osdiscovery/ios.inc.php
deleted file mode 100755
index 9db9bd29cc..0000000000
--- a/includes/osdiscovery/ios.inc.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Cisco Internetwork Operating System Software")) { $os = "ios"; }
-  if(strstr($sysDescr, "IOS (tm)")) { $os = "ios"; }
-  if(strstr($sysDescr, "Cisco IOS Software")) { $os = "ios"; }
-  if(strstr($sysDescr, "IOS-XE")) { $os = "iosxe"; }
-  if(strstr($sysDescr, "IOS XR")) { $os = "iosxr"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/ironware.inc.php b/includes/osdiscovery/ironware.inc.php
deleted file mode 100755
index a94238725e..0000000000
--- a/includes/osdiscovery/ironware.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(!$os) {
-  if(preg_match("/IronWare/", $sysDescr)) { $os = "ironware"; }
-}
-
-?>
diff --git a/includes/osdiscovery/jetdirect.inc.php b/includes/osdiscovery/jetdirect.inc.php
deleted file mode 100644
index 26b1675525..0000000000
--- a/includes/osdiscovery/jetdirect.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "JETDIRECT")) { $os = "jetdirect"; }
-  else if(strstr($sysDescr, "HP ETHERNET MULTI-ENVIRONMENT")) { $os = "jetdirect"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/junos.inc.php b/includes/osdiscovery/junos.inc.php
deleted file mode 100755
index 20946de6d3..0000000000
--- a/includes/osdiscovery/junos.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.2636")) { $os = "junos"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/junose.inc.php b/includes/osdiscovery/junose.inc.php
deleted file mode 100755
index 7a4f8f542f..0000000000
--- a/includes/osdiscovery/junose.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.4874")) { $os = "junose"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/konica.inc.php b/includes/osdiscovery/konica.inc.php
deleted file mode 100644
index 425383c380..0000000000
--- a/includes/osdiscovery/konica.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "KONICA MINOLTA ")) { $os = "konica"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/kyocera.inc.php b/includes/osdiscovery/kyocera.inc.php
deleted file mode 100644
index de9d853335..0000000000
--- a/includes/osdiscovery/kyocera.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "KYOCERA ")) { $os = "kyocera"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/linksys.inc.php b/includes/osdiscovery/linksys.inc.php
deleted file mode 100755
index 62a2de0c86..0000000000
--- a/includes/osdiscovery/linksys.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-?>
diff --git a/includes/osdiscovery/linux.inc.php b/includes/osdiscovery/linux.inc.php
deleted file mode 100755
index 11bec22aa3..0000000000
--- a/includes/osdiscovery/linux.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(!$os) {
-  if(preg_match("/^Linux/", $sysDescr)) { $os = "linux"; }
-}
-
-?>
diff --git a/includes/osdiscovery/m0n0wall.inc.php b/includes/osdiscovery/m0n0wall.inc.php
deleted file mode 100755
index 6eff33c4ec..0000000000
--- a/includes/osdiscovery/m0n0wall.inc.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-
-?>
diff --git a/includes/osdiscovery/mgepdu.inc.php b/includes/osdiscovery/mgepdu.inc.php
deleted file mode 100644
index 3a464e5775..0000000000
--- a/includes/osdiscovery/mgepdu.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "MGE Switched PDU")) { $os = "mgepdu"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/mgeups.inc.php b/includes/osdiscovery/mgeups.inc.php
deleted file mode 100644
index 89849ad9e3..0000000000
--- a/includes/osdiscovery/mgeups.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Pulsar M")) { $os = "mgeups"; }
-  else if(strstr($sysDescr, "Evolution S")) { $os = "mgeups"; }
-  else if(strstr($sysDescr, "Galaxy PW")) { $os = "mgeups"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/netbsd.inc.php b/includes/osdiscovery/netbsd.inc.php
deleted file mode 100755
index 220211d971..0000000000
--- a/includes/osdiscovery/netbsd.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(!$os) {
-  if(preg_match("/^NetBSD/", $sysDescr)) { $os = "netbsd"; }
-}
-
-?>
diff --git a/includes/osdiscovery/netmanplus.inc.php b/includes/osdiscovery/netmanplus.inc.php
deleted file mode 100644
index ee4fdf3733..0000000000
--- a/includes/osdiscovery/netmanplus.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/^NetMan.*plus/", $sysDescr)) { $os = "netmanplus"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/netopia.inc.php b/includes/osdiscovery/netopia.inc.php
deleted file mode 100644
index 68c15ec324..0000000000
--- a/includes/osdiscovery/netopia.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/^Netopia /", $sysDescr)) { $os = "netopia"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/netware.inc.php b/includes/osdiscovery/netware.inc.php
deleted file mode 100644
index b7abfc1182..0000000000
--- a/includes/osdiscovery/netware.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Novell NetWare")) { $os = "netware"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/nxos.inc.php b/includes/osdiscovery/nxos.inc.php
deleted file mode 100755
index 6e0f82f0f7..0000000000
--- a/includes/osdiscovery/nxos.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "NX-OS")) { $os = "nxos"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/openbsd.inc.php b/includes/osdiscovery/openbsd.inc.php
deleted file mode 100755
index 427207bec6..0000000000
--- a/includes/osdiscovery/openbsd.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(!$os) {
-  if(preg_match("/^OpenBSD/", $sysDescr)) { $os = "openbsd"; }
-}
-
-?>
diff --git a/includes/osdiscovery/papouch-tme.inc.php b/includes/osdiscovery/papouch-tme.inc.php
deleted file mode 100755
index 52e6441b22..0000000000
--- a/includes/osdiscovery/papouch-tme.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if($sysDescr == "SNMP TME") { $os = "papouch-tme"; }
-  else if($sysDescr == "TME") { $os = "papouch-tme"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/powerconnect.inc.php b/includes/osdiscovery/powerconnect.inc.php
deleted file mode 100755
index db4b0dff53..0000000000
--- a/includes/osdiscovery/powerconnect.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if (!$os) 
-{
-  #if (strstr($sysDescr, "Neyland 24T")) { $os = "powerconnect"; } /* Powerconnect 5324 */
-  if (stristr($sysDescr, "PowerConnect ")) { $os = "powerconnect"; }
-  else if (preg_match("/Dell.*Gigabit\ Ethernet/i",$sysDescr)) { $os = "powerconnect"; } 
-}
-
-?>
diff --git a/includes/osdiscovery/powervault.inc.php b/includes/osdiscovery/powervault.inc.php
deleted file mode 100644
index 31ce8a2415..0000000000
--- a/includes/osdiscovery/powervault.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.674.10893.2.102")) { $os = "powervault"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/prestige.inc.php b/includes/osdiscovery/prestige.inc.php
deleted file mode 100644
index 14c5108f86..0000000000
--- a/includes/osdiscovery/prestige.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/^Prestige \d/", $sysDescr)) { $os = "prestige"; }
-  else if (preg_match("/^P-.*-/", $sysDescr)) { $os = "prestige"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/procurve.inc.php b/includes/osdiscovery/procurve.inc.php
deleted file mode 100755
index e763a0e718..0000000000
--- a/includes/osdiscovery/procurve.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(stristr($sysDescr, "ProCurve")) { $os = "procurve"; }
-
-}
-
-
-?>
diff --git a/includes/osdiscovery/radlan.inc.php b/includes/osdiscovery/radlan.inc.php
deleted file mode 100755
index 7744f7c5e9..0000000000
--- a/includes/osdiscovery/radlan.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!$os) 
-{
-  if (strstr($sysDescr, "Neyland 24T")) { $os = "radlan"; }       /* Dell Powerconnect 5324 */
-  if (strstr($sysDescr, "AT-8000")) { $os = "radlan"; }           /* Allied Telesis AT-8000 */
-}
-
-?>
diff --git a/includes/osdiscovery/redback.inc.php b/includes/osdiscovery/redback.inc.php
deleted file mode 100644
index 6c86b44895..0000000000
--- a/includes/osdiscovery/redback.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(!$os) {
-  if(preg_match("/Redback/", $sysDescr)) { $os = "redback"; }
-}
-
-?>
diff --git a/includes/osdiscovery/ricoh.inc.php b/includes/osdiscovery/ricoh.inc.php
deleted file mode 100644
index 47df745ec0..0000000000
--- a/includes/osdiscovery/ricoh.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "RICOH Aficio")) { $os = "ricoh"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/routeros.inc.php b/includes/osdiscovery/routeros.inc.php
deleted file mode 100644
index 1f419ef216..0000000000
--- a/includes/osdiscovery/routeros.inc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(!$os) {
-
-       if ($sysDescr == "router") {
-               if (is_numeric(snmp_get($device, "SNMPv2-SMI::enterprises.14988.1.1.4.3.0", "-Oqv", ""))) {
-                       $os = "routeros";
-               }
-       }
-}
-
-?>
diff --git a/includes/osdiscovery/screenos.inc.php b/includes/osdiscovery/screenos.inc.php
deleted file mode 100755
index 25cd9c89a2..0000000000
--- a/includes/osdiscovery/screenos.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysObjectId, "netscreen")) { $os = "screenos"; } elseif (strstr($sysObjectId, ".1.3.6.1.4.1.674.3224.1")) { $os = "screenos";  }
-
-
-}
-
-?>
diff --git a/includes/osdiscovery/solaris.inc.php b/includes/osdiscovery/solaris.inc.php
deleted file mode 100755
index 17ded0274c..0000000000
--- a/includes/osdiscovery/solaris.inc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(!$os) {
-  if(preg_match("/^SunOS/", $sysDescr)) 
-  { 
-    $os = "solaris"; 
-    list(,,$version) = explode (" ", $sysDescr);
-    if($version > "5.10") { $os = "opensolaris"; }
-  }
-}
-
-?>
diff --git a/includes/osdiscovery/sonicwall.inc.php b/includes/osdiscovery/sonicwall.inc.php
deleted file mode 100644
index 31c150379e..0000000000
--- a/includes/osdiscovery/sonicwall.inc.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if (!$os) 
-{
-  if (strstr($sysDescr, "SonicWALL")) { $os = "sonicwall"; }
-}
-
-?>
diff --git a/includes/osdiscovery/speedtouch.inc.php b/includes/osdiscovery/speedtouch.inc.php
deleted file mode 100755
index 443a17dd7a..0000000000
--- a/includes/osdiscovery/speedtouch.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strpos($sysDescr, "TG585v7") !== FALSE) { $os = "speedtouch"; }
-  else if(strpos($sysDescr, "SpeedTouch 5") !== FALSE) { $os = "speedtouch"; }
-  else if (preg_match("/^ST\d/", $sysDescr)) { $os = "speedtouch"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/windows.inc.php b/includes/osdiscovery/windows.inc.php
deleted file mode 100644
index 3f34d13d57..0000000000
--- a/includes/osdiscovery/windows.inc.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(!$os) {
-  if(preg_match("/Windows/", $sysDescr)) { $os = "windows"; }
-}
-
-?>
-
diff --git a/includes/osdiscovery/xerox.inc.php b/includes/osdiscovery/xerox.inc.php
deleted file mode 100644
index 92b04f5b86..0000000000
--- a/includes/osdiscovery/xerox.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strstr($sysDescr, "Xerox Phaser")) { $os = "xerox"; }
-
-}
-
-?>
diff --git a/includes/osdiscovery/zywall.inc.php b/includes/osdiscovery/zywall.inc.php
deleted file mode 100644
index 7ae44e51d9..0000000000
--- a/includes/osdiscovery/zywall.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(!$os) {
-
-  if(strpos($sysDescr, "ZyWALL") !== FALSE) { $os = "zywall"; }
-
-}
-
-
-?>
diff --git a/includes/osdiscovery/zyxeles.inc.php b/includes/osdiscovery/zyxeles.inc.php
deleted file mode 100644
index 24d99a3b41..0000000000
--- a/includes/osdiscovery/zyxeles.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!$os) {
-
-  if (preg_match("/^ES-/", $sysDescr)) { $os = "zyxeles"; }
-
-}
-
-?>