diff --git a/includes/polling/port-adsl.inc.php b/includes/polling/port-adsl.inc.php
index 901fb6d0b..42b986428 100644
--- a/includes/polling/port-adsl.inc.php
+++ b/includes/polling/port-adsl.inc.php
@@ -39,10 +39,7 @@
 // adslAturPerfESs.1 = 0 seconds
 // adslAturPerfValidIntervals.1 = 0
 // adslAturPerfInvalidIntervals.1 = 0
-if (isset($port_stats[$ifIndex]['adslLineCoding'])) {
-    // Check to make sure Port data is cached.
-    $this_port = &$port_stats[$ifIndex];
-
+if (isset($this_port['adslLineCoding'])) {
     $rrdfile = get_port_rrdfile_path ($device['hostname'], $port_id, 'adsl');
 
     $rrd_create  = ' --step 300';
diff --git a/includes/polling/port-etherlike.inc.php b/includes/polling/port-etherlike.inc.php
index ea8b044c2..729990162 100644
--- a/includes/polling/port-etherlike.inc.php
+++ b/includes/polling/port-etherlike.inc.php
@@ -1,11 +1,6 @@
 <?php
 
-if ($port_stats[$ifIndex] &&
-    $port['ifType'] == 'ethernetCsmacd' &&
-    isset($port_stats[$ifIndex]['dot3StatsIndex'])) {
-    // Check to make sure Port data is cached.
-    $this_port = &$port_stats[$ifIndex];
-
+if ($this_port['dot3StatsIndex'] and $port['ifType'] == 'ethernetCsmacd') {
     // TODO: remove legacy check?
     $old_rrdfile = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('etherlike-'.$port['ifIndex'].'.rrd');
     $rrd_file    = get_port_rrdfile_path ($device['hostname'], $port_id, 'dot3');
diff --git a/includes/polling/port-poe.inc.php b/includes/polling/port-poe.inc.php
index 08642d232..f9fdc99db 100644
--- a/includes/polling/port-poe.inc.php
+++ b/includes/polling/port-poe.inc.php
@@ -35,12 +35,7 @@ $peth_oids = array(
     'pethMainPseConsumptionPower',
 );
 
-if ($port_stats[$ifIndex]
-    && $port['ifType'] == 'ethernetCsmacd'
-    && isset($port_stats[$ifIndex]['dot3StatsIndex'])) {
-    // Check to make sure Port data is cached.
-    $this_port = &$port_stats[$ifIndex];
-
+if ($this_port['dot3StatsIndex'] && $port['ifType'] == 'ethernetCsmacd') {
     $rrdfile = get_port_rrdfile_path ($device['hostname'], $port_id, 'poe');
     if (!file_exists($rrdfile)) {
         $rrd_create .= $config['rrd_rra'];