diff --git a/public/app/features/dashboard/submenu/submenu.html b/public/app/features/dashboard/submenu/submenu.html
index 429772bb7ea..3b025ee026a 100644
--- a/public/app/features/dashboard/submenu/submenu.html
+++ b/public/app/features/dashboard/submenu/submenu.html
@@ -1,11 +1,5 @@
 <div class="submenu-controls gf-form-query">
 
-  <div class="gf-form submenu-item" ng-if="ctrl.variables.length === 0">
-    <a class="gf-form-label" ng-click="ctrl.openEditView('templating')">
-      Add Templating
-    </a>
-  </div>
-
   <div ng-repeat="variable in ctrl.variables" ng-hide="variable.hide === 2" class="submenu-item gf-form-inline">
     <div class="gf-form">
       <label class="gf-form-label template-variable" ng-hide="variable.hide === 1">
@@ -16,12 +10,6 @@
     <ad-hoc-filters ng-if="variable.type === 'adhoc'" variable="variable"></ad-hoc-filters>
   </div>
 
-  <div class="gf-form submenu-item" ng-if="ctrl.dashboard.annotations.list.length === 0">
-    <a class="gf-form-label" ng-click="ctrl.openEditView('annotations')">
-      Add Annotations
-    </a>
-  </div>
-
   <div ng-if="ctrl.dashboard.annotations.list.length > 0">
     <div ng-repeat="annotation in ctrl.dashboard.annotations.list" class="submenu-item" ng-class="{'annotation-disabled': !annotation.enable}">
       <gf-form-switch class="gf-form" label="{{annotation.name}}" checked="annotation.enable" on-change="ctrl.annotationStateChanged()"></gf-form-switch>