diff --git a/html/includes/graphs/device/uptime.inc.php b/html/includes/graphs/device/uptime.inc.php
index 69775f1fc..d80b1350f 100644
--- a/html/includes/graphs/device/uptime.inc.php
+++ b/html/includes/graphs/device/uptime.inc.php
@@ -5,11 +5,7 @@ $scale_min = "0";
include("includes/graphs/common.inc.php");
$device = device_by_id_cache($id);
-if (is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd")) {
- $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd";
-} else {
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
-}
$rrd_options .= " DEF:uptime=$rrd_filename:uptime:AVERAGE";
$rrd_options .= " CDEF:cuptime=uptime,86400,/";
diff --git a/html/index.php b/html/index.php
index ec635ed54..33caf1be6 100755
--- a/html/index.php
+++ b/html/index.php
@@ -107,7 +107,8 @@ function popUp(URL) {
$end = utime(); $run = $end - $start;
$gentime = substr($run, 0, 5);
- echo '