diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index 64ccc2a95..78f30928f 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -104,16 +104,7 @@ if($need_alert_display == true) {
 
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav navbar-right">
-					<li id="menu_messages">
-					<?php
-						echo get_menu_messages();
-					?>
-					</li>
-					<?php
-						if (isset($shortcut_section)) {
-							echo '<li>'.get_shortcut_log_link($shortcut_section, false).'</li>';
-						}
-					?>
+					<li id="menu_messages"><?= get_menu_messages() ?></li>
 				</ul>
 
 			</div>
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index 438c1cc94..27bbd03c7 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -345,7 +345,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$shortcut_section = "dhcp6";
 $closehead = false;
 
 include("head.inc");
diff --git a/src/www/services_dhcpv6_edit.php b/src/www/services_dhcpv6_edit.php
index d49e9eda5..38d4b39a3 100644
--- a/src/www/services_dhcpv6_edit.php
+++ b/src/www/services_dhcpv6_edit.php
@@ -162,8 +162,6 @@ if ($_POST) {
 	}
 }
 
-$shortcut_section = "dhcp6";
-
 include("head.inc");
 
 ?>
diff --git a/src/www/services_dhcpv6_relay.php b/src/www/services_dhcpv6_relay.php
index 93d95a22e..17586adf9 100644
--- a/src/www/services_dhcpv6_relay.php
+++ b/src/www/services_dhcpv6_relay.php
@@ -90,7 +90,6 @@ if ($_POST) {
 	}
 }
 
-$shortcut_section = "dhcp6";
 $closehead = false;
 
 include("head.inc");
diff --git a/src/www/shortcuts.inc b/src/www/shortcuts.inc
index 6308ea175..21a18a1a7 100644
--- a/src/www/shortcuts.inc
+++ b/src/www/shortcuts.inc
@@ -43,33 +43,15 @@ function get_shortcut_by_service_name($servicename)
 	return null;
 }
 
-function get_shortcut_log_link($shortcut_section, $addspace = true)
-{
-	global $g, $shortcuts;
-
-	$space = ($addspace) ? "&nbsp;" : "" ;
-	if(!empty($shortcut_section) && !empty($shortcuts[$shortcut_section]['log'])) {
-		if (strtok($_SERVER['REQUEST_URI'],'?') != "/status_services.php")
-			return "{$space}<a href=\"{$shortcuts[$shortcut_section]['log']}\" title=\"" . gettext("Log entries for items on this page") . "\">Log</a>";
-		else
-			return "{$space}<a href=\"{$shortcuts[$shortcut_section]['log']}\" class=\"btn btn-default\" data-toggle=\"tooltip\" data-placement=\"bottom\" title=\"" . gettext("Log entries for items on this page") . "\"><span class=\"glyphicon glyphicon-list\"></span></a>";
-	}
-}
-
 $shortcuts['upnp'] = array();
-$shortcuts['upnp']['log'] = "diag_logs_routing.php";
 $shortcuts['upnp']['service'] = "miniupnpd";
 
 $shortcuts['relayd'] = array();
 $shortcuts['relayd']['service'] = "relayd";
 
 $shortcuts['dhcp'] = array();
-$shortcuts['dhcp']['log'] = "diag_logs_dhcp.php";
 $shortcuts['dhcp']['service'] = "dhcpd";
 
-$shortcuts['dhcp6'] = array();
-$shortcuts['dhcp6']['log'] = "diag_logs_dhcp.php";
-
 $shortcuts['ipsec'] = array();
 $shortcuts['ipsec']['service'] = "ipsec";
 
@@ -88,9 +70,6 @@ $shortcuts['ntp']['service'] = 'ntpd';
 $shortcuts['gateways'] = array();
 $shortcuts['gateways']['service'] = "apinger";
 
-$shortcuts['pppoes'] = array();
-$shortcuts['pppoes']['log'] = "diag_logs_vpn.php?vpntype=poes";
-
 $shortcuts['snmp'] = array();
 $shortcuts['snmp']['service'] = "bsnmpd";
 
diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php
index d593b08cc..ec64d50f6 100644
--- a/src/www/status_dhcpv6_leases.php
+++ b/src/www/status_dhcpv6_leases.php
@@ -34,8 +34,6 @@ require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 
-$shortcut_section = "dhcp6";
-
 $leasesfile = "{$g['dhcpd_chroot_path']}/var/db/dhcpd6.leases";
 
 if (($_GET['deleteip']) && (is_ipaddr($_GET['deleteip']))) {
diff --git a/src/www/status_services.php b/src/www/status_services.php
index 3ce48a1ad..478b1335e 100644
--- a/src/www/status_services.php
+++ b/src/www/status_services.php
@@ -307,7 +307,6 @@ include("head.inc");
                     <td>
                       <?=get_service_status_icon($service, true, true);?>
                       <?=get_service_control_links($service);?>
-                      <?=!empty(get_shortcut_by_service_name($service['name'])) ? get_shortcut_log_link($scut, true) :"";?>
                     </td>
                 </tr>
 <?php
diff --git a/src/www/vpn_pppoe.php b/src/www/vpn_pppoe.php
index cc636c9db..826bff3cb 100644
--- a/src/www/vpn_pppoe.php
+++ b/src/www/vpn_pppoe.php
@@ -81,8 +81,6 @@ if ($_GET['act'] == "del") {
     }
 }
 
-$shortcut_section = "pppoes";
-
 include("head.inc");
 
 $main_buttons = array(
diff --git a/src/www/vpn_pppoe_edit.php b/src/www/vpn_pppoe_edit.php
index ccddeb2e8..dc75e2416 100644
--- a/src/www/vpn_pppoe_edit.php
+++ b/src/www/vpn_pppoe_edit.php
@@ -253,8 +253,6 @@ if ($_POST) {
     }
 }
 
-$shortcut_section = "pppoes";
-
 include("head.inc");
 
 ?>