diff --git a/includes/common.php b/includes/common.php
index 63bda59b0..442a05f62 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -18,7 +18,7 @@ function delete_port($int_id)
   dbDelete('links', "`remote_interface_id` =  ?", array($int_id));
   dbDelete('bill_ports', "`port_id` =  ?", array($int_id));
 
-  unlink(trim($config['rrd_dir'])."/".trim($interface['hostname'])."/".$interface['ifIndex'].".rrd");
+  unlink(trim($config['rrd_dir'])."/".trim($interface['hostname'])."/port-".$interface['ifIndex'].".rrd");
 }
 
 function sgn($int)
diff --git a/includes/functions.php b/includes/functions.php
index 21f514a8e..63e657848 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -151,8 +151,6 @@ function delete_device($id)
 
   $host = dbFetchCell("SELECT hostname FROM devices WHERE device_id = ?", array($id));
 
-  dbDelete('devices', "`device_id` =  ?", array($id));
-
   foreach (dbFetch("SELECT * FROM `ports` WHERE `device_id` = ?", array($id)) as $int_data)
   {
     $int_if = $int_data['ifDescr'];
@@ -160,6 +158,8 @@ function delete_device($id)
     delete_port($int_id);
     $ret .= "Removed interface $int_id ($int_if)\n";
   }
+
+  dbDelete('devices', "`device_id` =  ?", array($id));
   
   $device_tables = array('entPhysical', 'devices_attribs', 'devices_perms', 'bgpPeers', 'vlans', 'vrfs', 'storage', 'alerts', 'eventlog', 
                          'syslog', 'ports', 'services', 'alerts', 'toner', 'frequency', 'current', 'sensors');