diff --git a/host-del.php b/host-del.php
index 152a7e889..ba2ee3055 100755
--- a/host-del.php
+++ b/host-del.php
@@ -8,13 +8,14 @@ include("includes/functions.php");
 if($argv[1]) { 
   $host = strtolower($argv[1]);
   $id = getidbyname($host);
-  mysql_query("DELETE FROM `devices` WHERE `id` = '$id'");
-  mysql_query("DELETE FROM `interfaces` WHERE `host` = '$id'");
-  `rm -f rrd/$host-*.rrd`;
-  `./cleanup.php`;
-  echo("Removed $host");
+  if($id) {
+    delHost($id);
+    echo("Removed $host\n");
+  } else {
+    echo("Host doesn't exist!\n");
+  }
 } else {
-  echo("Need host to remove!\n\n");
+    echo("Need host to remove!\n\n");
 }
 
 ?>
diff --git a/html/pages/devices.php b/html/pages/devices.php
index 9cee2dba9..1cc553835 100644
--- a/html/pages/devices.php
+++ b/html/pages/devices.php
@@ -13,7 +13,7 @@ $device_query = mysql_query($sql);
 echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
 
 while($device = mysql_fetch_array($device_query)) {
-  $device['uptime'] = mysql_result(mysql_query("SELECT `attrib_value` FROM `devices_attribs` WHERE `device_id` = '" . $device['device_id'] ."' AND `attrib_type` = 'uptime'"), 0);
+  $device['uptime'] = @mysql_result(mysql_query("SELECT `attrib_value` FROM `devices_attribs` WHERE `device_id` = '" . $device['device_id'] ."' AND `attrib_type` = 'uptime'"), 0);
 
   include("includes/hostbox.inc");
 }
diff --git a/includes/functions.php b/includes/functions.php
index fe976704c..ef2047039 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -109,21 +109,25 @@ function delHost($id) {
 
   $host = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '$id'"), 0);
   mysql_query("DELETE FROM `devices` WHERE `device_id` = '$id'");
-  $int_query = mysql_query("SELECT * FROM `interfaces` WHERE `host` = '$id'");
+  $int_query = mysql_query("SELECT * FROM `interfaces` WHERE `device_id` = '$id'");
   while($int_data = mysql_fetch_array($int_query)) {
-    $int_if = $int_data['if'];
-    $int_id = $int_data['id'];
+    $int_if = $int_data['ifDescr'];
+    $int_id = $int_data['interface_id'];
     mysql_query("DELETE from `adjacencies` WHERE `interface_id` = '$int_id'");
     mysql_query("DELETE from `links` WHERE `src_if` = '$int_id'");
     mysql_query("DELETE from `links` WHERE `dst_if` = '$int_id'");
     mysql_query("DELETE from `ipaddr` WHERE `interface_id` = '$int_id'");
     echo("Removed interface $int_id ($int_if)<br />");
   }
+  mysql_query("DELETE FROM `devices_attribs` WHERE `device_id` = '$id'");
+  mysql_query("DELETE FROM `temperature` WHERE `temp_host` = '$id'");
   mysql_query("DELETE FROM `storage` WHERE `host_id` = '$id'");
   mysql_query("DELETE FROM `alerts` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `eventlog` WHERE `host` = '$id'");
+  mysql_query("DELETE FROM `syslog` WHERE `host` = '$id'");
   mysql_query("DELETE FROM `interfaces` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `services` WHERE `service_host` = '$id'");
+  mysql_query("DELETE FROM `alerts` WHERE `device_id` = '$id'");
   `rm -f rrd/$host-*.rrd`;
   echo("Removed device $host<br />");
 }