diff --git a/public/sass/_angular.scss b/public/sass/_angular.scss
index 738fa9e9383..e886ad72383 100644
--- a/public/sass/_angular.scss
+++ b/public/sass/_angular.scss
@@ -623,3 +623,341 @@ $doc-font-size: $font-size-sm;
     }
   }
 }
+
+// Baron styles
+.baron {
+  // display: inline-block; // this brakes phantomjs rendering (width becomes 0)
+  overflow: hidden;
+}
+
+// Fix for side menu on mobile devices
+.main-view.baron {
+  width: unset;
+}
+
+.baron__clipper {
+  position: relative;
+  overflow: hidden;
+}
+
+.baron__scroller {
+  overflow-y: scroll;
+  -ms-overflow-style: none;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  margin: 0;
+  border: 0;
+  padding: 0;
+  width: 100%;
+  height: 100%;
+  -webkit-overflow-scrolling: touch;
+  /* remove line to customize scrollbar in iOs */
+}
+
+.baron__scroller::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+}
+
+.baron__track {
+  display: none;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.baron._scrollbar .baron__track {
+  display: block;
+}
+
+.baron__free {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  right: 0;
+}
+
+.baron__bar {
+  display: none;
+  position: absolute;
+  right: 0;
+  z-index: 1;
+  // width: 10px;
+  background: #999;
+
+  // height: 15px;
+  width: 15px;
+  transition:
+    background-color 0.2s linear,
+    opacity 0.2s linear;
+  opacity: 0;
+}
+
+.baron._scrollbar .baron__bar {
+  display: block;
+
+  @include gradient-vertical($scrollbarBackground, $scrollbarBackground2);
+  border-radius: 6px;
+  width: 6px;
+  /* there must be 'right' for ps__thumb-y */
+  right: 0px;
+  /* please don't change 'position' */
+  position: absolute;
+
+  // background-color: transparent;
+  // opacity: 0.6;
+
+  &:hover,
+  &:focus {
+    // background-color: transparent;
+    opacity: 0.9;
+  }
+}
+
+.panel-hover-highlight .baron__track .baron__bar {
+  opacity: 0.6;
+}
+
+.baron._scrolling > .baron__track .baron__bar {
+  opacity: 0.9;
+}
+
+.baron__control {
+  display: none;
+}
+
+.baron.panel-content--scrollable {
+  // Width needs to be set to prevent content width issues
+  // Set to less than 100% for fixing Firefox issue (white stripe on the right of scrollbar)
+  width: calc(100% - 2px);
+
+  .baron__scroller {
+    padding-top: 1px;
+  }
+}
+
+// temp hack
+.modal-body {
+  .nav-tabs {
+    border-bottom: none;
+  }
+
+  .nav-tabs > li > a {
+    border: none;
+    border-radius: 0;
+    &:hover,
+    &:focus {
+      border-bottom: 1px solid $blue;
+    }
+  }
+
+  .nav-tabs > .active > a,
+  .nav-tabs > .active > a:hover,
+  .nav-tabs > .active > a:focus {
+    border: none;
+    border-bottom: 1px solid $blue;
+    color: $link-color;
+  }
+}
+
+.grafana-tooltip {
+  position: absolute;
+  top: -1000;
+  left: 0;
+  color: $tooltipColor;
+  padding: 10px;
+  font-size: 11pt;
+  font-weight: 200;
+  background-color: $tooltipBackground;
+  border-radius: 5px;
+  z-index: 9999;
+  max-width: 800px;
+  max-height: 600px;
+  overflow: hidden;
+  line-height: 14px;
+
+  a {
+    color: $tooltipLinkColor;
+  }
+
+  a.external-link {
+    color: $tooltipExternalLinkColor;
+  }
+}
+
+.grafana-tip {
+  padding-left: 5px;
+}
+
+.table-panel-content {
+  padding: 0;
+
+  .panel-title-container {
+    padding-bottom: 4px;
+  }
+}
+
+.table-panel-scroll {
+  overflow: auto;
+}
+
+.table-panel-container {
+  padding-top: 2.2em;
+  position: relative;
+}
+
+.table-panel-footer {
+  text-align: center;
+  font-size: 90%;
+  line-height: 2px;
+
+  ul {
+    position: relative;
+    display: inline-block;
+    margin-left: 0;
+    margin-bottom: 0;
+  }
+
+  ul > li {
+    display: inline; // Remove list-style and block-level defaults
+  }
+
+  ul > li > a {
+    float: left; // Collapse white-space
+    padding: 4px 12px;
+    text-decoration: none;
+    border-left-width: 0;
+
+    &:hover {
+      background-color: $tight-form-func-bg;
+    }
+
+    &.active {
+      font-weight: bold;
+      color: $blue;
+    }
+  }
+}
+
+.table-panel-table {
+  width: 100%;
+  border-collapse: collapse;
+
+  th {
+    padding: 0;
+
+    &:first-child {
+      .table-panel-table-header-inner {
+        padding-left: 15px;
+      }
+    }
+  }
+
+  td {
+    padding: 0.45em 1.1em;
+    border-bottom: 2px solid $body-bg;
+    border-right: 2px solid $body-bg;
+
+    &:first-child {
+      padding-left: 15px;
+    }
+    &:last-child {
+      border-right: none;
+    }
+
+    &.table-panel-cell-pre {
+      white-space: pre;
+    }
+
+    &.table-panel-cell-link {
+      // Expand internal div to cell size (make all cell clickable)
+      padding: 0;
+
+      a {
+        padding: 0.45em 0 0.45em 1.1em;
+        height: 100%;
+        display: inline-block;
+        text-decoration: underline;
+        text-underline-position: under;
+      }
+    }
+
+    &.cell-highlighted:hover {
+      background-color: $tight-form-func-bg;
+    }
+
+    &:hover {
+      .table-panel-filter-link {
+        visibility: visible;
+      }
+    }
+  }
+}
+
+.table-panel-filter-link {
+  visibility: hidden;
+  color: $text-color-weak;
+  float: right;
+  display: block;
+  padding: 0 5px;
+}
+
+.table-panel-header-bg {
+  background: $list-item-bg;
+  border-top: 2px solid $body-bg;
+  border-bottom: 2px solid $body-bg;
+  height: 2em;
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+}
+
+.table-panel-table-header-inner {
+  padding: 0.3em 0 0.45em 1.1em;
+  text-align: left;
+  color: $blue;
+  position: absolute;
+  top: 0;
+}
+
+.table-panel-width-hack {
+  visibility: hidden;
+  height: 0px;
+  line-height: 0px;
+}
+
+.table-panel-color-cell {
+  color: white;
+  a {
+    color: white;
+  }
+}
+
+.table-panel-color-row {
+  color: white;
+  a {
+    color: white;
+  }
+}
+
+.editor-row {
+  vertical-align: top;
+}
+
+.section {
+  margin-right: 42px;
+  vertical-align: top;
+  display: inline-block;
+}
+
+div.editor-option {
+  vertical-align: top;
+  display: inline-block;
+  margin-right: 10px;
+}
+
+div.editor-option label {
+  display: block;
+}
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 8deb22688b1..8dd2f7349d2 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -26,21 +26,13 @@
 // COMPONENTS
 @import 'components/scrollbar';
 @import 'components/buttons';
-@import 'components/navs';
 @import 'components/alerts';
 @import 'components/switch';
-@import 'components/tooltip';
 @import 'components/tags';
 @import 'components/submenu';
-@import 'components/panel_pluginlist';
-@import 'components/panel_singlestat';
-@import 'components/panel_table';
-@import 'components/panel_heatmap';
 @import 'components/tagsinput';
 @import 'components/gf-form';
-@import 'components/filter-list';
 @import 'components/filter-table';
-@import 'components/old_stuff';
 @import 'components/slate_editor';
 @import 'components/typeahead';
 @import 'components/modals';
diff --git a/public/sass/components/_filter-list.scss b/public/sass/components/_filter-list.scss
deleted file mode 100644
index 8c4b453c3dd..00000000000
--- a/public/sass/components/_filter-list.scss
+++ /dev/null
@@ -1,137 +0,0 @@
-// ==========================================================================
-// FILTER LIST
-// ==========================================================================
-
-// List
-// --------------------------------------------------------------------------
-
-.filter-list {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-.filter-list > li {
-  padding: 10px;
-  margin-bottom: 2px;
-  background: $panel-bg;
-
-  &:last-child {
-    margin: 0;
-  }
-}
-
-// Card
-// --------------------------------------------------------------------------
-
-.filter-list-card {
-  display: table;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-.filter-list-card > li {
-  display: table-cell;
-  vertical-align: top;
-}
-
-.filter-list-card-select {
-  width: 23px;
-  padding-right: 5px;
-}
-
-.filter-list-card-title {
-  display: block;
-  font-size: 16px;
-  font-weight: normal;
-}
-
-.filter-list-card-image {
-  width: 50px;
-  padding: 5px 50px 5px 5px;
-}
-
-.filter-list-card-status {
-  color: #777;
-  font-size: 12px;
-}
-
-.filter-list-card-state {
-  display: inline-block;
-  padding: 5px 0 0 28px;
-  background: 0 bottom no-repeat;
-  background-size: 24px auto;
-  font-size: 14px;
-  text-transform: uppercase;
-
-  &.online {
-    background-image: url('../img/online.svg');
-    color: $online;
-  }
-
-  &.warn {
-    background-image: url('../img/warn-tiny.svg');
-    color: $warn;
-  }
-
-  &.critical {
-    background-image: url('../img/critical.svg');
-    color: $critical;
-  }
-}
-
-.filter-list-card-controls {
-  float: right;
-}
-
-.filter-list-card-links,
-.filter-list-card-config,
-.filter-list-card-expand {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.filter-list-card-link {
-  display: block;
-  color: #777;
-  text-align: right;
-
-  > a {
-    color: #777;
-  }
-}
-
-.filter-list-card-config {
-  padding: 8px 8px 8px 16px;
-  color: #777;
-  font-size: 25px;
-
-  > a {
-    color: #777;
-  }
-}
-
-.filter-list-card-expand {
-  width: 20px;
-  padding: 8px 0 8px 8px;
-  color: #aaa;
-  font-size: 30px;
-  text-align: center;
-  cursor: pointer;
-}
-
-.filter-list-card-details {
-  padding: 20px 0 0 30px;
-}
-
-.filter-list-card-details-heading {
-  font-weight: normal;
-
-  > a {
-    float: right;
-    color: $blue;
-    font-size: 12px;
-  }
-}
diff --git a/public/sass/components/_navs.scss b/public/sass/components/_navs.scss
deleted file mode 100644
index 545b93d6d39..00000000000
--- a/public/sass/components/_navs.scss
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Navs
-// --------------------------------------------------
-
-// BASE CLASS
-// ----------
-
-.nav {
-  margin: 0;
-  list-style: none;
-}
-
-// Make links block level
-.nav > li > a {
-  display: block;
-}
-
-// Redeclare pull classes because of specificity
-.nav > .pull-right {
-  float: right;
-}
-
-// TABS AND PILLS
-// -------------
-
-// Common styles
-.nav-tabs {
-  @include clearfix();
-}
-.nav-tabs > li {
-  float: left;
-}
-.nav-tabs > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px; // keeps the overall height an even number
-}
-
-// TABS
-// ----
-
-// Give the tabs something to sit on
-.nav-tabs {
-  border-bottom: 1px solid $divider-border-color;
-  padding-left: 10px;
-  margin: 0 0 10px 0;
-}
-
-// Make the list-items overlay the bottom border
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-
-// Active state, and it's :hover/:focus to override normal :hover/:focus
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  @include border-radius(3px);
-  border-color: $divider-border-color;
-  border-bottom: 1px solid $panel-bg;
-  color: $link-color;
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane {
-  display: none;
-}
-
-.tab-content > .active {
-  display: block;
-}
-
-// temp hack
-.modal-body {
-  .nav-tabs {
-    border-bottom: none;
-  }
-
-  .nav-tabs > li > a {
-    border: none;
-    border-radius: 0;
-    &:hover,
-    &:focus {
-      border-bottom: 1px solid $blue;
-    }
-  }
-
-  .nav-tabs > .active > a,
-  .nav-tabs > .active > a:hover,
-  .nav-tabs > .active > a:focus {
-    border: none;
-    border-bottom: 1px solid $blue;
-    color: $link-color;
-  }
-}
diff --git a/public/sass/components/_old_stuff.scss b/public/sass/components/_old_stuff.scss
deleted file mode 100644
index d976cd9401e..00000000000
--- a/public/sass/components/_old_stuff.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.editor-row {
-  vertical-align: top;
-}
-
-.section {
-  margin-right: 42px;
-  vertical-align: top;
-  display: inline-block;
-}
-
-div.editor-option {
-  vertical-align: top;
-  display: inline-block;
-  margin-right: 10px;
-}
-
-div.editor-option label {
-  display: block;
-}
diff --git a/public/sass/components/_panel_heatmap.scss b/public/sass/components/_panel_heatmap.scss
deleted file mode 100644
index 62b5ad68cea..00000000000
--- a/public/sass/components/_panel_heatmap.scss
+++ /dev/null
@@ -1,93 +0,0 @@
-@use 'sass:color';
-$font-size-heatmap-tick: 11px;
-
-.heatmap-canvas-wrapper {
-  // position: relative;
-  cursor: crosshair;
-}
-
-.heatmap-panel {
-  position: relative;
-
-  .axis .tick {
-    text {
-      fill: $text-color;
-      color: $text-color;
-      font-size: $font-size-heatmap-tick;
-    }
-
-    line {
-      opacity: 0.4;
-      stroke: $text-color-weak;
-    }
-  }
-
-  // This hack prevents mouseenter/mouseleave events get fired too often
-  svg {
-    pointer-events: none;
-
-    rect {
-      pointer-events: visiblePainted;
-    }
-  }
-}
-
-.heatmap-tooltip {
-  white-space: nowrap;
-  font-size: $font-size-sm;
-  background-color: $graph-tooltip-bg;
-  color: $text-color;
-}
-
-.heatmap-histogram rect {
-  fill: $text-color-weak;
-}
-
-.heatmap-crosshair {
-  line {
-    stroke: color.adjust($red, $lightness: -15%);
-    stroke-width: 1;
-  }
-}
-
-.heatmap-selection {
-  stroke-width: 1;
-  fill: rgba(102, 102, 102, 0.4);
-  stroke: rgba(102, 102, 102, 0.8);
-}
-
-.heatmap-legend-wrapper {
-  @include clearfix();
-  margin: 0 $spacer;
-  padding-top: 4px;
-
-  svg {
-    width: 100%;
-    max-width: 300px;
-    height: 18px;
-    float: left;
-    white-space: nowrap;
-  }
-
-  .heatmap-legend-values {
-    display: inline-block;
-  }
-
-  .axis .tick {
-    text {
-      fill: $text-color;
-      color: $text-color;
-      font-size: $font-size-heatmap-tick;
-    }
-
-    line {
-      opacity: 0.4;
-      stroke: $text-color-weak;
-    }
-
-    .domain {
-      opacity: 0.4;
-      stroke: $text-color-weak;
-    }
-  }
-}
diff --git a/public/sass/components/_panel_pluginlist.scss b/public/sass/components/_panel_pluginlist.scss
deleted file mode 100644
index 68018124222..00000000000
--- a/public/sass/components/_panel_pluginlist.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-.pluginlist-section-header {
-  margin-bottom: $spacer;
-  color: $text-color-weak;
-}
-
-.pluginlist-section {
-  margin-bottom: $spacer;
-}
-
-.pluginlist-link {
-  @include list-item();
-}
-
-.pluginlist-icon {
-  vertical-align: sub;
-  font-size: $font-size-h1;
-  margin-right: calc($spacer / 2);
-}
-
-.pluginlist-image {
-  width: 17px;
-}
-
-.pluginlist-title {
-  margin-right: calc($spacer / 3);
-}
-
-.pluginlist-version {
-  font-size: $font-size-sm;
-  color: $text-color-weak;
-}
-
-.pluginlist-message {
-  float: right;
-  font-size: $font-size-sm;
-}
-
-.pluginlist-message--update {
-  &:hover {
-    border-bottom: 1px solid $text-color;
-  }
-}
-
-.pluginlist-message--enable {
-  color: $external-link-color;
-  &:hover {
-    border-bottom: 1px solid $external-link-color;
-  }
-}
-
-.pluginlist-message--no-update {
-  color: $text-color-weak;
-}
-
-.pluginlist-emphasis {
-  font-weight: $font-weight-semi-bold;
-}
diff --git a/public/sass/components/_panel_singlestat.scss b/public/sass/components/_panel_singlestat.scss
deleted file mode 100644
index d80a72cf40a..00000000000
--- a/public/sass/components/_panel_singlestat.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-.singlestat-panel {
-  position: relative;
-  display: table;
-  width: 100%;
-  height: 100%;
-}
-
-.singlestat-panel-value-container {
-  display: table-cell;
-  vertical-align: middle;
-  text-align: center;
-  position: relative;
-  z-index: 1;
-  font-weight: $font-weight-semi-bold;
-  line-height: 1;
-}
-
-// Helps
-.panel-container--no-title {
-  .singlestat-panel-value-container {
-    padding-bottom: 0;
-  }
-}
-
-.singlestat-panel-prefix {
-  padding-right: 20px;
-}
-
-#flotGaugeValue0 {
-  font-weight: $font-weight-semi-bold; //please dont hurt me for this!
-}
diff --git a/public/sass/components/_panel_table.scss b/public/sass/components/_panel_table.scss
deleted file mode 100644
index bdf32b2da2e..00000000000
--- a/public/sass/components/_panel_table.scss
+++ /dev/null
@@ -1,151 +0,0 @@
-.table-panel-content {
-  padding: 0;
-
-  .panel-title-container {
-    padding-bottom: 4px;
-  }
-}
-
-.table-panel-scroll {
-  overflow: auto;
-}
-
-.table-panel-container {
-  padding-top: 2.2em;
-  position: relative;
-}
-
-.table-panel-footer {
-  text-align: center;
-  font-size: 90%;
-  line-height: 2px;
-
-  ul {
-    position: relative;
-    display: inline-block;
-    margin-left: 0;
-    margin-bottom: 0;
-  }
-
-  ul > li {
-    display: inline; // Remove list-style and block-level defaults
-  }
-
-  ul > li > a {
-    float: left; // Collapse white-space
-    padding: 4px 12px;
-    text-decoration: none;
-    border-left-width: 0;
-
-    &:hover {
-      background-color: $tight-form-func-bg;
-    }
-
-    &.active {
-      font-weight: bold;
-      color: $blue;
-    }
-  }
-}
-
-.table-panel-table {
-  width: 100%;
-  border-collapse: collapse;
-
-  th {
-    padding: 0;
-
-    &:first-child {
-      .table-panel-table-header-inner {
-        padding-left: 15px;
-      }
-    }
-  }
-
-  td {
-    padding: 0.45em 1.1em;
-    border-bottom: 2px solid $body-bg;
-    border-right: 2px solid $body-bg;
-
-    &:first-child {
-      padding-left: 15px;
-    }
-    &:last-child {
-      border-right: none;
-    }
-
-    &.table-panel-cell-pre {
-      white-space: pre;
-    }
-
-    &.table-panel-cell-link {
-      // Expand internal div to cell size (make all cell clickable)
-      padding: 0;
-
-      a {
-        padding: 0.45em 0 0.45em 1.1em;
-        height: 100%;
-        display: inline-block;
-        text-decoration: underline;
-        text-underline-position: under;
-      }
-    }
-
-    &.cell-highlighted:hover {
-      background-color: $tight-form-func-bg;
-    }
-
-    &:hover {
-      .table-panel-filter-link {
-        visibility: visible;
-      }
-    }
-  }
-}
-
-.table-panel-filter-link {
-  visibility: hidden;
-  color: $text-color-weak;
-  float: right;
-  display: block;
-  padding: 0 5px;
-}
-
-.table-panel-header-bg {
-  background: $list-item-bg;
-  border-top: 2px solid $body-bg;
-  border-bottom: 2px solid $body-bg;
-  height: 2em;
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-}
-
-.table-panel-table-header-inner {
-  padding: 0.3em 0 0.45em 1.1em;
-  text-align: left;
-  color: $blue;
-  position: absolute;
-  top: 0;
-}
-
-.table-panel-width-hack {
-  visibility: hidden;
-  height: 0px;
-  line-height: 0px;
-}
-
-.table-panel-color-cell {
-  color: white;
-  a {
-    color: white;
-  }
-}
-
-.table-panel-color-row {
-  color: white;
-  a {
-    color: white;
-  }
-}
diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss
index edb379ae5b6..1d2f90f130f 100644
--- a/public/sass/components/_scrollbar.scss
+++ b/public/sass/components/_scrollbar.scss
@@ -1,119 +1,3 @@
-/*
- * Container style
- */
-.ps {
-  overflow: hidden !important;
-  overflow-anchor: none;
-  -ms-overflow-style: none;
-  touch-action: auto;
-  -ms-touch-action: auto;
-}
-
-// ._scrollbar {
-//   overflow-x: hidden !important;
-//   overflow-y: auto;
-// }
-
-/*
- * Scrollbar rail styles
- */
-.ps__rail-x {
-  display: none;
-  opacity: 0;
-  transition:
-    background-color 0.2s linear,
-    opacity 0.2s linear;
-  -webkit-transition:
-    background-color 0.2s linear,
-    opacity 0.2s linear;
-  height: 15px;
-  /* there must be 'bottom' or 'top' for ps__rail-x */
-  bottom: 0px;
-  /* please don't change 'position' */
-  position: absolute;
-}
-
-.ps__rail-y {
-  display: none;
-  opacity: 0;
-  transition:
-    background-color 0.2s linear,
-    opacity 0.2s linear;
-  -webkit-transition:
-    background-color 0.2s linear,
-    opacity 0.2s linear;
-  width: 15px;
-  /* there must be 'right' or 'left' for ps__rail-y */
-  right: 0;
-  /* please don't change 'position' */
-  position: absolute;
-}
-
-.ps--active-x > .ps__rail-x,
-.ps--active-y > .ps__rail-y {
-  display: block;
-  background-color: transparent;
-}
-
-.ps--focus > .ps__rail-x,
-.ps--focus > .ps__rail-y,
-.ps--scrolling-x > .ps__rail-x,
-.ps--scrolling-y > .ps__rail-y {
-  opacity: 0.6;
-}
-
-.ps__rail-x:hover,
-.ps__rail-y:hover,
-.ps__rail-x:focus,
-.ps__rail-y:focus {
-  background-color: transparent;
-  opacity: 0.9;
-}
-
-/*
- * Scrollbar thumb styles
- */
-.ps__thumb-x {
-  background-color: #aaa;
-  border-radius: 6px;
-  height: 6px;
-  /* there must be 'bottom' for ps__thumb-x */
-  bottom: 2px;
-  /* please don't change 'position' */
-  position: absolute;
-}
-
-.ps__thumb-y {
-  @include gradient-vertical($scrollbarBackground, $scrollbarBackground2);
-  border-radius: 6px;
-  width: 6px;
-  /* there must be 'right' for ps__thumb-y */
-  right: 0px;
-  /* please don't change 'position' */
-  position: absolute;
-}
-
-/* MS supports */
-@supports (-ms-overflow-style: none) {
-  .ps {
-    overflow: auto !important;
-  }
-}
-
-@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-  .ps {
-    overflow: auto !important;
-  }
-}
-
-.ps__rail-x:hover,
-.ps__rail-y:hover,
-.ps__rail-x:focus,
-.ps__rail-y:focus {
-  background-color: transparent;
-  opacity: 0.9;
-}
-
 // Scrollbars
 // Note, this is not applied by default if the `betterPageScrolling` feature flag is applied
 .no-overlay-scrollbar {
@@ -186,120 +70,3 @@
     border-left: 1px solid $scrollbarBorder;
   }
 }
-
-// Baron styles
-.baron {
-  // display: inline-block; // this brakes phantomjs rendering (width becomes 0)
-  overflow: hidden;
-}
-
-// Fix for side menu on mobile devices
-.main-view.baron {
-  width: unset;
-}
-
-.baron__clipper {
-  position: relative;
-  overflow: hidden;
-}
-
-.baron__scroller {
-  overflow-y: scroll;
-  -ms-overflow-style: none;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  margin: 0;
-  border: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  -webkit-overflow-scrolling: touch;
-  /* remove line to customize scrollbar in iOs */
-}
-
-.baron__scroller::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-}
-
-.baron__track {
-  display: none;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.baron._scrollbar .baron__track {
-  display: block;
-}
-
-.baron__free {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  right: 0;
-}
-
-.baron__bar {
-  display: none;
-  position: absolute;
-  right: 0;
-  z-index: 1;
-  // width: 10px;
-  background: #999;
-
-  // height: 15px;
-  width: 15px;
-  transition:
-    background-color 0.2s linear,
-    opacity 0.2s linear;
-  opacity: 0;
-}
-
-.baron._scrollbar .baron__bar {
-  display: block;
-
-  @include gradient-vertical($scrollbarBackground, $scrollbarBackground2);
-  border-radius: 6px;
-  width: 6px;
-  /* there must be 'right' for ps__thumb-y */
-  right: 0px;
-  /* please don't change 'position' */
-  position: absolute;
-
-  // background-color: transparent;
-  // opacity: 0.6;
-
-  &:hover,
-  &:focus {
-    // background-color: transparent;
-    opacity: 0.9;
-  }
-}
-
-.panel-hover-highlight .baron__track .baron__bar {
-  opacity: 0.6;
-}
-
-.baron._scrolling > .baron__track .baron__bar {
-  opacity: 0.9;
-}
-
-.baron__control {
-  display: none;
-}
-
-.baron.panel-content--scrollable {
-  // Width needs to be set to prevent content width issues
-  // Set to less than 100% for fixing Firefox issue (white stripe on the right of scrollbar)
-  width: calc(100% - 2px);
-
-  .baron__scroller {
-    padding-top: 1px;
-  }
-}
-
-.scroll-margin-helper {
-  margin-right: 12px;
-}
diff --git a/public/sass/components/_tooltip.scss b/public/sass/components/_tooltip.scss
deleted file mode 100644
index 42ceb6e95fb..00000000000
--- a/public/sass/components/_tooltip.scss
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Tooltips
-// --------------------------------------------------
-
-// Base class
-.tooltip {
-  position: absolute;
-  z-index: $zindex-tooltip;
-  display: block;
-  visibility: visible;
-  line-height: 1.4;
-  font-weight: $font-weight-semi-bold;
-  @include opacity(0);
-
-  &.in {
-    @include opacity(100);
-  }
-
-  &.top {
-    margin-top: -3px;
-    padding: 5px 0;
-  }
-
-  &.right {
-    margin-left: 3px;
-    padding: 0 5px;
-  }
-
-  &.bottom {
-    margin-top: 3px;
-    padding: 5px 0;
-  }
-
-  &.left {
-    margin-left: -3px;
-    padding: 0 5px;
-  }
-}
-
-// Wrapper for the tooltip content
-.tooltip-inner {
-  max-width: 400px;
-  padding: 8px 16px;
-  padding: 4px 8px;
-  color: $tooltipColor;
-  text-align: center;
-  text-decoration: none;
-  background-color: $tooltipBackground;
-  border-radius: 2px;
-}
-
-// Arrows
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.tooltip {
-  &.top .tooltip-arrow {
-    bottom: 0;
-    left: 50%;
-    margin-left: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth $tooltipArrowWidth 0;
-    border-top-color: $tooltipArrowColor;
-  }
-
-  &.right .tooltip-arrow {
-    top: 50%;
-    left: 0;
-    margin-top: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth $tooltipArrowWidth $tooltipArrowWidth 0;
-    border-right-color: $tooltipArrowColor;
-  }
-
-  &.left .tooltip-arrow {
-    top: 50%;
-    right: 0;
-    margin-top: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth 0 $tooltipArrowWidth $tooltipArrowWidth;
-    border-left-color: $tooltipArrowColor;
-  }
-
-  &.bottom .tooltip-arrow {
-    top: 0;
-    left: 50%;
-    margin-left: -$tooltipArrowWidth;
-    border-width: 0 $tooltipArrowWidth $tooltipArrowWidth;
-    border-bottom-color: $tooltipArrowColor;
-  }
-}
-
-.grafana-tooltip {
-  position: absolute;
-  top: -1000;
-  left: 0;
-  color: $tooltipColor;
-  padding: 10px;
-  font-size: 11pt;
-  font-weight: 200;
-  background-color: $tooltipBackground;
-  border-radius: 5px;
-  z-index: 9999;
-  max-width: 800px;
-  max-height: 600px;
-  overflow: hidden;
-  line-height: 14px;
-
-  a {
-    color: $tooltipLinkColor;
-  }
-
-  a.external-link {
-    color: $tooltipExternalLinkColor;
-  }
-}
-
-.grafana-tip {
-  padding-left: 5px;
-}