diff --git a/html/includes/graphs/device_cpu.inc.php b/html/includes/graphs/device_cpu.inc.php
index 37b3a16fce..728e28e618 100644
--- a/html/includes/graphs/device_cpu.inc.php
+++ b/html/includes/graphs/device_cpu.inc.php
@@ -10,7 +10,6 @@ while($proc = mysql_fetch_array($query)) {
   if(is_file($rrd_filename)) {
 
     $descr = short_hrDeviceDescr($proc['processor_descr']);
-    $descr = str_replace(":", "\:", $descr);
 
     $rrd_list[$i]['filename'] = $rrd_filename;
     $rrd_list[$i]['descr'] = $descr;
diff --git a/html/includes/graphs/device_cpu_junos.inc.php b/html/includes/graphs/device_cpu_junos.inc.php
deleted file mode 100644
index a8bd7900f7..0000000000
--- a/html/includes/graphs/device_cpu_junos.inc.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-$unit_text = "Load %";
-
-$units='%';
-$total_units='%';
-$colours='mixed';
-
-$scale_min = "0";
-$scale_max = "100";
-
-$nototal = 1;
-
-include("common.inc.php");
-$database = $config['rrd_dir'] . "/" . $hostname . "/junos-cpu.rrd";
-
-$rrd_options .= " DEF:load=$database:LOAD:AVERAGE";
-$rrd_options .= " DEF:load_max=$database:LOAD:MAX";
-$rrd_options .= " DEF:load_min=$database:LOAD:MIN";
-$rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Current\ \ Minimum\ \ Maximum\ \ Average\\\\n";
-$rrd_options .= " AREA:load#ffee99: LINE1.25:load#aa2200:Load\ %";
-$rrd_options .= " GPRINT:load:LAST:%6.2lf\  GPRINT:load_min:AVERAGE:%6.2lf\ ";
-$rrd_options .= " GPRINT:load_max:MAX:%6.2lf\  GPRINT:load:AVERAGE:%6.2lf\\\\n";
-
-?>
diff --git a/html/includes/graphs/generic_multi_line.inc.php b/html/includes/graphs/generic_multi_line.inc.php
index 1017570e01..c84320c3a5 100644
--- a/html/includes/graphs/generic_multi_line.inc.php
+++ b/html/includes/graphs/generic_multi_line.inc.php
@@ -19,8 +19,8 @@
       $rra = $rrd['rra'];
       $filename = $rrd['filename'];
       $descr = $rrd['descr'];
-
-      $descr = substr(str_pad(short_hrDeviceDescr($rrd['descr']), 10),0,10);
+      $descr = substr(str_pad($descr, 10),0,10);
+      $descr = str_replace(":", "\:", $descr);
 
       $id = $rra."_".$i;
       
diff --git a/html/includes/graphs/processor.inc.php b/html/includes/graphs/processor.inc.php
index 7f1c9fec80..f3090e1f4f 100755
--- a/html/includes/graphs/processor.inc.php
+++ b/html/includes/graphs/processor.inc.php
@@ -13,11 +13,11 @@ include("common.inc.php");
     if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
     } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
     } elseif($iter=="7") {$colour="FF0084"; unset($iter); }
-    $proc['descr_fixed'] = substr(str_pad(short_hrDeviceDescr($proc['hrDeviceDescr']), 28),0,28);
-    $proc['descr_fixed'] = str_replace(":", "\:", $proc['descr_fixed']);
+    $descr = substr(str_pad(short_hrDeviceDescr($proc['processor_descr']), 28),0,28);
+    $descr = str_replace(":", "\:", $descr);
     $rrd  = $config['rrd_dir'] . "/".$proc['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
     $rrd_options .= " DEF:proc" . $proc['hrDeviceIndex'] . "=$rrd:usage:AVERAGE ";
-    $rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $proc['descr_fixed'] . "' ";
+    $rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $descr . "' ";
     $rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":LAST:%3.0lf";
     $rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":MAX:%3.0lf\\\l ";
     $iter++;