diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html
index 1de2e52..d0c2aa6 100644
--- a/app/common/directives/app-header.html
+++ b/app/common/directives/app-header.html
@@ -6,9 +6,6 @@
   </header>
   <div class="header__functions-wrapper" role="heading">
     <div class="logo__wrapper"><img src="../../assets/images/logo.svg" class="header__logo" alt="company logo"/></div>
-    <!-- <button class="inline header__multi-server" aria-label="multi server select" ng-class="{'active': multi_server_recent}" ng-click="multiRecent();">
-      <span class="icon icon-angle" aria-hidden="true"></span><span class="accessible-text">Multi server switcher</span>
-    </button>-->
     <div class="inline header__server-name">
       <p class="header__hostname">{{dataService.hostname}}</p>
       <p class="header__server-ip courier-bold">BMC host/IP address {{dataService.server_id}}</p>
@@ -28,4 +25,4 @@
       </button>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/common/directives/app-header.js b/app/common/directives/app-header.js
index 92f4ef3..0e0a6e6 100644
--- a/app/common/directives/app-header.js
+++ b/app/common/directives/app-header.js
@@ -134,10 +134,6 @@
             $scope.$on('$destroy', function() {
               loginListener();
             });
-
-            $scope.multiRecent = function() {
-              $scope.multi_server_recent = !$scope.multi_server_recent;
-            };
           }
         ]
       };
diff --git a/app/common/directives/app-navigation.html b/app/common/directives/app-navigation.html
index 9438e85..b70fa8f 100644
--- a/app/common/directives/app-navigation.html
+++ b/app/common/directives/app-navigation.html
@@ -64,18 +64,6 @@
         <span>Users</span>
       </button>
     </li>
-    <!--<li class="btn-multi-server">
-      <a ng-class="{opened: firstLevel == 'multi-server'}" href="#/multi-server/overview" ng-click="change('multi-server')" tabindex="6">
-        <span>
-          <svg class="nav-icon" version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 24 24" xml:space="preserve">
-<path d="M12.8,7.3h4c0.2,1.5,1.5,2.8,3.1,2.8c1.7,0,3.1-1.4,3.1-3.1s-1.4-3.1-3.1-3.1c-1.5,0-2.7,1-3,2.4h-4C12.4,3.3,9.9,1,6.9,1
-  C3.7,1,1,3.6,1,6.9c0,0,0,0,0,0c0,3.1,2.4,5.7,5.5,5.9v4c-1.3,0.4-2.4,1.6-2.4,3c0,1.7,1.4,3.1,3.1,3.1s3.1-1.4,3.1-3.1
-  c0-1.6-1.2-2.9-2.8-3.1v-4c1.1-0.2,2.1-0.6,2.9-1.3l4.7,4.7c-0.4,0.5-0.6,1.1-0.6,1.8c0,1.7,1.4,3.1,3.1,3.1c1.7,0,3.1-1.4,3.1-3.1
-  c0-1.7-1.4-3.1-3.1-3.1c-0.6,0-1.3,0.2-1.8,0.6l-4.7-4.7C12.2,9.7,12.7,8.5,12.8,7.3z M2.2,6.9c0-2.6,2.1-4.7,4.7-4.7
-  s4.7,2.1,4.7,4.7s-2.1,4.7-4.7,4.7S2.2,9.5,2.2,6.9z"/>
-</svg>
-        All Servers</span></a>
-    </li> -->
   </ul>
   <ul class="nav__second-level btn-health" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'server-health')}">
     <li ng-class="{'active': (path == '/server-health/event-log')}">