diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php
index 93c8fc41bb..34608f1ecc 100644
--- a/includes/polling/bgp-peers.inc.php
+++ b/includes/polling/bgp-peers.inc.php
@@ -262,14 +262,14 @@ print_r($peer_afis);
                             $cbgp_data=  array_pop($cbgp_data);
                             d_echo("$cbgp_data\n");
                         }//end if
-                        $cbgpPeerAcceptedPrefixes=  !empty($cbgp_data['cbgpPeerAcceptedPrefixes'])?$cbgp_data['cbgpPeerAcceptedPrefixes']:'';
-                        $cbgpPeerDeniedPrefixes=  !empty($cbgp_data['cbgpPeerDeniedPrefixes'])?$cbgp_data['cbgpPeerDeniedPrefixes']:'';
-                        $cbgpPeerPrefixAdminLimit=  !empty($cbgp_data['cbgpPeerPrefixAdminLimit'])?$cbgp_data['cbgpPeerPrefixAdminLimit']:'';
-                        $cbgpPeerPrefixThreshold=  !empty($cbgp_data['cbgpPeerPrefixThreshold'])?$cbgp_data['cbgpPeerPrefixThreshold']:'';
-                        $cbgpPeerPrefixClearThreshold=  !empty($cbgp_data['cbgpPeerPrefixClearThreshold'])?$cbgp_data['cbgpPeerPrefixClearThreshold']:'';
-                        $cbgpPeerAdvertisedPrefixes=  !empty($cbgp_data['cbgpPeerAdvertisedPrefixes'])?$cbgp_data['cbgpPeerAdvertisedPrefixes']:'';
-                        $cbgpPeerSuppressedPrefixes=  !empty($cbgp_data['cbgpPeerSuppressedPrefixes'])?$cbgp_data['cbgpPeerSuppressedPrefixes']:'';
-                        $cbgpPeerWithdrawnPrefixes=  !empty($cbgp_data['cbgpPeerWithdrawnPrefixes'])?$cbgp_data['cbgpPeerWithdrawnPrefixes']:'';
+                        $cbgpPeerAcceptedPrefixes = $cbgp_data['cbgpPeerAcceptedPrefixes'];
+                        $cbgpPeerDeniedPrefixes = $cbgp_data['cbgpPeerDeniedPrefixes'];
+                        $cbgpPeerPrefixAdminLimit = $cbgp_data['cbgpPeerPrefixAdminLimit'];
+                        $cbgpPeerPrefixThreshold = $cbgp_data['cbgpPeerPrefixThreshold'];
+                        $cbgpPeerPrefixClearThreshold = $cbgp_data['cbgpPeerPrefixClearThreshold'];
+                        $cbgpPeerAdvertisedPrefixes = $cbgp_data['cbgpPeerAdvertisedPrefixes'];
+                        $cbgpPeerSuppressedPrefixes = $cbgp_data['cbgpPeerSuppressedPrefixes'];
+                        $cbgpPeerWithdrawnPrefixes = $cbgp_data['cbgpPeerWithdrawnPrefixes'];
                         unset($cbgp_data);
                     }//end if
 
diff --git a/includes/polling/netstats-icmp.inc.php b/includes/polling/netstats-icmp.inc.php
index f324f6a10f..19df0a5c4b 100644
--- a/includes/polling/netstats-icmp.inc.php
+++ b/includes/polling/netstats-icmp.inc.php
@@ -46,17 +46,7 @@ if ($device['os'] != 'Snom') {
 
     $data_array = snmpwalk_cache_oid($device, 'icmp', array(), 'IP-MIB');
 
-    $fields = array();
-
-    foreach ($oids as $oid) {
-        if (is_numeric($data_array[0][$oid])) {
-            $value = $data_array[0][$oid];
-        }
-        else {
-            $value = 'U';
-        }
-        $fields[$oid] = $value;
-    }
+    $fields = $data_array[0];
 
     unset($snmpstring);
 
diff --git a/includes/polling/netstats-tcp.inc.php b/includes/polling/netstats-tcp.inc.php
index d763e2a30b..3d060f6e4b 100644
--- a/includes/polling/netstats-tcp.inc.php
+++ b/includes/polling/netstats-tcp.inc.php
@@ -36,17 +36,7 @@ if ($device['os'] != 'Snom') {
 
     $data = snmp_get_multi($device, $snmpstring, '-OQUs', 'TCP-MIB');
 
-    $fields = array();
-
-    foreach ($oids as $oid) {
-        if (is_numeric($data[0][$oid])) {
-            $value = $data[0][$oid];
-        }
-        else {
-            $value = 'U';
-        }
-        $fields[$oid] = $value;
-    }
+    $fields = $data[0];
 
     unset($snmpstring);