diff --git a/source/Styles/xb3/jst/connection_status.jst b/source/Styles/xb3/jst/connection_status.jst
index 2eba34b..7752d56 100644
--- a/source/Styles/xb3/jst/connection_status.jst
+++ b/source/Styles/xb3/jst/connection_status.jst
@@ -171,25 +171,12 @@ if($OperatingChannelBandwidth == "6GHz")
 //-----------------------WAN IPv6 Address - Start
     $WANIPv6 = "";
     $fistUSif = getFirstUpstreamIpInterface();
-    $partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
-    if (strpos($partnerId, "sky-") !== false) {
-        $ids = explode(",", getInstanceIds($fistDSif+"IPv6Address."));
-        for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
-            $val = getStr($fistDSif+"IPv6Address."+$i+".IPAddress");
-            if (!strstr($val, "fe80::")){
-                $WANIPv6=$val;
-                break;
-            }else{$WANIPv6='';}
-        }
-    }
-    else {
-        $ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
-        for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
-            $val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
-                if (!strstr($val, "fe80::")){
-                $WANIPv6 = $val;
-		break;
-            }
+    $ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
+    for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
+        $val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
+        if (!strstr($val, "fe80::")){
+            $WANIPv6 = $val;
+            break;
         }
     }
 //-----------------------WAN IPv6 Address - End
diff --git a/source/Styles/xb3/jst/network_setup.jst b/source/Styles/xb3/jst/network_setup.jst
index 7cfab06..c04c9d4 100644
--- a/source/Styles/xb3/jst/network_setup.jst
+++ b/source/Styles/xb3/jst/network_setup.jst
@@ -108,42 +108,22 @@ function sec2dhm($sec)
 	$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
 	$fistUSif = getFirstUpstreamIpInterface();
 	$WANIPv4 = getStr($fistUSif+"IPv4Address.1.IPAddress");
-	$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
 	$WANIPv6="";
 	$DHCP_LET_IPv6="";
 	$WANIPv6LinkLocal="";
-	if (strpos($partnerId, "sky-") !== false) {
-		$fistDSif = getFirstDownstreamIpInterface();
-		$ids = explode(",", getInstanceIds($fistDSif+"IPv6Address."));
-		for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
-			$val = getStr($fistDSif+"IPv6Address."+$i+".IPAddress");
-			if (!strstr($val, "fe80::")){
-				$WANIPv6=$val;
-					//DHCP Lease Expire Time (IPv6):
-					// echo $fistUSif."IPv6Address.$i.X_Comcast_com_LeaseTime";
-					$sec = getStr($fistDSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
-					$DHCP_LET_IPv6 = sec2dhm($sec);
-			}
-			if (strstr($val, "fe80::")){
-				$WANIPv6LinkLocal = $val;
-			}
-		}
-	}
-	else{
-		$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
+	$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
 	for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
 		$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
 		if (!strstr($val, "fe80::")){
 			$WANIPv6 = $val;
-				//DHCP Lease Expire Time (IPv6):
-				// echo $fistUSif."IPv6Address."+$i+".X_Comcast_com_LeaseTime";
-				$sec = getStr($fistUSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
-				$DHCP_LET_IPv6 = sec2dhm($sec);
+			//DHCP Lease Expire Time (IPv6):
+			// echo $fistUSif."IPv6Address."+$i+".X_Comcast_com_LeaseTime";
+			$sec = getStr($fistUSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
+			$DHCP_LET_IPv6 = sec2dhm($sec);
 		}
 		if (strstr($val, "fe80::")){
 			$WANIPv6LinkLocal = $val;
 		}
-	    }
 	}
     $dhcpv6_server_type = getStr("Device.DHCPv6.Server.X_CISCO_COM_Type");
         if(strpos($partnerId, "sky-") !== false && $dhcpv6_server_type == "Stateless") {
diff --git a/source/Styles/xb3/jst/remote_management.jst b/source/Styles/xb3/jst/remote_management.jst
index 58d68d7..c8f844d 100644
--- a/source/Styles/xb3/jst/remote_management.jst
+++ b/source/Styles/xb3/jst/remote_management.jst
@@ -812,10 +812,6 @@ function remote_access_block(){
 			<br/>
 			<span id="remmess2">Remote Management Address (IPv6):</span>
 			<?%
-				/* Fiber devices use brlan0 ipv6 address */
-				if ((get_wan_type() == "DSL" && strpos($partnerId, "sky-") !== false)) {
-					$fistUSif = getFirstDownstreamIpInterface();
-				}
 				$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
 				for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
 					$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
diff --git a/source/Styles/xb6/jst/connection_status_onewifi.jst b/source/Styles/xb6/jst/connection_status_onewifi.jst
index 24ad5d3..701a33f 100644
--- a/source/Styles/xb6/jst/connection_status_onewifi.jst
+++ b/source/Styles/xb6/jst/connection_status_onewifi.jst
@@ -168,24 +168,11 @@ if($OperatingChannelBandwidth == "6GHz")
 //-----------------------WAN IPv6 Address - Start
     $WANIPv6 = "";
     $fistUSif = getFirstUpstreamIpInterface();
-    $partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
-    if (strpos($partnerId, "sky-") !== false) {
-        $ids = explode(",", getInstanceIds($fistDSif+"IPv6Address."));
-        for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
-            $val = getStr($fistDSif+"IPv6Address."+$i+".IPAddress");
-            if (!strstr($val, "fe80::")){
-                $WANIPv6=$val;
-                break;
-            }else{$WANIPv6='';}
-        }
-    }
-    else {
-        $ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
-        for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
-            $val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
-                if (!strstr($val, "fe80::")){
-                $WANIPv6 = $val;
-            }
+    $ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
+    for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
+        $val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
+        if (!strstr($val, "fe80::")){
+            $WANIPv6 = $val;
         }
     }
 //-----------------------WAN IPv6 Address - End
diff --git a/source/Styles/xb6/jst/network_setup.jst b/source/Styles/xb6/jst/network_setup.jst
index 364a226..a7d1765 100644
--- a/source/Styles/xb6/jst/network_setup.jst
+++ b/source/Styles/xb6/jst/network_setup.jst
@@ -97,42 +97,22 @@ function sec2dhm($sec)
 	}
 	else
 		$WANIPv4 = getStr($fistUSif+"IPv4Address.1.IPAddress");
-	$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
 	$WANIPv6="";
 	$DHCP_LET_IPv6="";
 	$WANIPv6LinkLocal="";
-	if (strpos($partnerId, "sky-") !== false) {
-		$fistDSif = getFirstDownstreamIpInterface();
-		$ids = explode(",", getInstanceIds($fistDSif+"IPv6Address."));
-		for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
-			$val = getStr($fistDSif+"IPv6Address."+$i+".IPAddress");
-			if (!strstr($val, "fe80::")){
-				$WANIPv6=$val;
-					//DHCP Lease Expire Time (IPv6):
-					// echo $fistUSif."IPv6Address.$i.X_Comcast_com_LeaseTime";
-					$sec = getStr($fistDSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
-					$DHCP_LET_IPv6 = sec2dhm($sec);
-			}
-			if (strstr($val, "fe80::")){
-				$WANIPv6LinkLocal = $val;
-			}
-		}
-	}
-	else{
-		$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
+	$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
 	for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
 		$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
 		if (!strstr($val, "fe80::")){
 			$WANIPv6 = $val;
-				//DHCP Lease Expire Time (IPv6):
-				// echo $fistUSif."IPv6Address."+$i+".X_Comcast_com_LeaseTime";
-				$sec = getStr($fistUSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
-				$DHCP_LET_IPv6 = sec2dhm($sec);
+			//DHCP Lease Expire Time (IPv6):
+			// echo $fistUSif."IPv6Address."+$i+".X_Comcast_com_LeaseTime";
+			$sec = getStr($fistUSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
+			$DHCP_LET_IPv6 = sec2dhm($sec);
 		}
 		if (strstr($val, "fe80::")){
 			$WANIPv6LinkLocal = $val;
 		}
-	    }
 	}
         if (!$WANIPv6) {
                 $WANIPv6 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IPv6");