diff --git a/cleanup.php b/cleanup.php
deleted file mode 100755
index bbced96c1..000000000
--- a/cleanup.php
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/env php
-
-<?php
-### Clean up the database removing old IPs and links
-
-include("includes/defaults.inc.php");
-include("config.php");
-include("includes/functions.php");
-
-$query = "SELECT *,A.id as id FROM ipv4_addresses AS A, ports as I, devices as D
-  WHERE A.interface_id = I.interface_id AND I.device_id = D.device_id AND D.status = '1'";
-
-$data = mysql_query($query);
-
-while ($row = mysql_fetch_assoc($data))
-{
-  $addr = Net_IPv4::parseAddress($row['ipv4_address']."/".$row['ipv4_prefixlen']);
-  $mask = $addr->netmask;
-  $response = explode(" ", snmp_get($row, "ipAdEntIfIndex.".$row['ipv4_address'], "-Osq"));
-  $response = $response[1];
-  $maskcheck = explode(" ", snmp_get($row, "ipAdEntNetMask.".$row['ipv4_address'], "-Osq"));
-  $maskcheck = $maskcheck[1];
-
-  if ($response != $row['ifIndex'] || $mask != $maskcheck)
-  {
-    mysql_query("delete from ipv4_address where id = '".$row['ipv4_address_id']."'");
-    echo("Deleted ".$row['ipv4_address']." from $row[hostname]\n");
-  }
-}
-
-$sql = "SELECT * FROM devices WHERE status = '1'";
-$query = mysql_query($sql);
-
-while ($device = mysql_fetch_assoc($query))
-{
-  echo($device['hostname'] . " \n\n");
-
-  $oids = snmp_walk($device, "ipAddressIfIndex.ipv6", "-Osq");
-  $oids = str_replace("ipAddressIfIndex.ipv6.", "", $oids);
-  $oids = str_replace("\"", "", $oids);  $oids = trim($oids);
-
-  unset($valid_ips);
-
-  foreach (explode("\n", $oids) as $data)
-  {
-    $data = trim($data);
-    list($ipv6addr,$ifIndex) = explode(" ", $data);
-    $valid_ips[] = $ipv6addr;
-  }
-
-  $sql = "SELECT * FROM ip6addr AS A, ports AS I, devices as D WHERE A.interface_id = I.interface_id AND I.device_id = '".$device['device_id']."'";
-  $data = mysql_query($sql);
-
-  while ($row = mysql_fetch_assoc($data))
-  {
-    echo($row['ipv6_address'] . "\n");
-    unset($valid);
-    foreach ($valid_ips as $valid_ip)
-    {
-      echo($row['ipv6_address'] . " = $valid_ip ? \n");
-    }
-  }
-}
-
-
-$query = "SELECT * FROM ports AS I, devices as D WHERE I.device_id = D.device_id AND D.status = '1'";
-$data = mysql_query($query);
-
-while ($row = mysql_fetch_assoc($data))
-{
-  $index = $row['ifIndex'];
-
-  $response = explode(" ", snmp_get($row, "ifIndex.$index", "-Osq"));
-  $response = $response[1];
-
-  if ($response != $index)
-  {
-    mysql_query("DELETE from ports where interface_id = '" . $row['interface_id'] . "'");
-    mysql_query("DELETE from `adjacencies` WHERE `interface_id` = '" . $row['interface_id'] . "'");
-    mysql_query("DELETE from `links` WHERE `local_interface_id` = '" . $row['interface_id'] . "'");
-    mysql_query("DELETE from `links` WHERE `remote_interface_id` = '" . $row['interface_id'] . "'");
-    mysql_query("DELETE from `ipaddr` WHERE `interface_id` = '" . $row['interface_id'] . "'");
-    echo("Removed interface " . $row['ifDescr'] . " from " . $row['hostname'] . "<br />");
-  }
-}
-
-echo(mysql_result(mysql_query("SELECT COUNT(*) FROM `ports`"), 0) . " ports at start\n");
-$interface_query = mysql_query("SELECT interface_id,device_id FROM `ports`");
-
-while ($interface = mysql_fetch_assoc($interface_query))
-{
-  $device_id = $interface['device_id'];
-  $interface_id = $interface['interface_id'];
-  if (mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `device_id` = '$device_id'"), 0) == '0')
-  {
-    mysql_query("delete from ports where `interface_id` = '$interface_id'");
-    echo("Deleting if $interface_id \n");
-  }
-}
-
-echo(mysql_result(mysql_query("SELECT COUNT(*) FROM `ports`"), 0) . " ports at end\n");
-
-echo(mysql_result(mysql_query("SELECT COUNT(id) FROM `links`"), 0) . " links at start\n");
-$link_query = mysql_query("SELECT id,local_interface_id,remote_interface_id FROM `links`");
-
-while ($link = mysql_fetch_assoc($link_query))
-{
-  $id = $link['id'];
-  $src = $link['local_interface_id'];
-  $dst = $link['remote_interface_id'];
-  if (mysql_result(mysql_query("SELECT COUNT(interface_id) FROM `ports` WHERE `interface_id` = '$src'"), 0) == '0' || mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `interface_id` = '$dst'"), 0) == '0')
-  {
-    mysql_query("delete from links where `id` = '$id'");
-    echo("Deleting link $id \n");
-  }
-}
-echo(mysql_result(mysql_query("SELECT COUNT(id) FROM `links`"), 0) . " links at end\n");
-
-echo(mysql_result(mysql_query("SELECT COUNT(adj_id) FROM `adjacencies`"), 0) . " adjacencies at start\n");
-$link_query = mysql_query("SELECT * FROM `adjacencies` AS A, `ports` AS I, `devices` AS D, networks AS N WHERE I.interface_id = A.interface_id AND D.device_id = I.device_id AND N.id = A.network_id");
-
-while ($link = mysql_fetch_assoc($link_query))
-{
-  $id = $link['adj_id'];
-  $netid = $link['network_id'];
-  $ifid = $link['interface_id'];
-  if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `interface_id` = '$ifid'"), 0) == '0' || mysql_result(mysql_query("SELECT COUNT(id) FROM `networks` WHERE `id` = '$netid'"), 0) == '0')
-  {
-    $remove = 1;
-    echo("Removed Interface!\n");
-  }
-
-  list($network, $cidr) = explode("/", $link['cidr']);
-
-  $checksql = "SELECT COUNT(*) FROM `ipaddr` WHERE `interface_id` = '" . $link['interface_id'] . "' AND `cidr` = '$cidr' AND `network` = '$network'";
-  if (mysql_result(mysql_query($checksql),0) == 0) { $remove = 1; }
-
-  #  echo($link['if'] . " (" . $link['interface_id'] . ") -> " . $link['cidr'] . " \n");
-
-  if ($link['cidr'] == "") { $remove = 1; echo("Broken CIDR entry!"); }
-
-    if ($remove)
-    {
-      mysql_query("delete from adjacencies where `adj_id` = '$id'");
-      echo("Deleting link $id (".$link['cidr']." - ". $link['hostname'] ." - ". $link['ifDescr']  .")\n");
-    }
-
-    unset($remove);
-}
-
-echo(mysql_result(mysql_query("SELECT COUNT(adj_id) FROM `adjacencies`"), 0) . " adjacencies at end\n");
-
-?>
\ No newline at end of file
diff --git a/includes/static-config.php b/includes/static-config.php
index 0cb965b35..e73100ae6 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -943,7 +943,6 @@ try {
     $db = new PDO('mysql:host='.$config['db_host'].';dbname='.$config['db_name'], $config['db_user'], $config['db_pass']);
 } catch (PDOException $e) {
     print "Error!: " . $e->getMessage() . "<br/>";
-    die();
 }
 
 # Set some times needed by loads of scripts (it's dynamic, so we do it here!)