diff --git a/packages/grafana-ui/src/components/DataSourceSettings/CustomHeaderSettings.story.tsx b/packages/grafana-ui/src/components/DataSourceSettings/CustomHeaderSettings.story.tsx
index f9035ffedc7..3e78d19e05b 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/CustomHeaderSettings.story.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/CustomHeaderSettings.story.tsx
@@ -4,7 +4,7 @@ import { CustomHeadersSettings } from './CustomHeadersSettings';
 import { DataSourceSettings } from '@grafana/data';
 
 export default {
-  title: 'UI/DataSource/CustomHeadersSettings',
+  title: 'Panel/DataSource/CustomHeadersSettings',
   component: CustomHeadersSettings,
   decorators: [withCenteredStory, withHorizontallyCenteredStory],
 };
diff --git a/packages/grafana-ui/src/components/Forms/Form.story.tsx b/packages/grafana-ui/src/components/Forms/Form.story.tsx
index 9256108a5ca..669d1ed4e36 100644
--- a/packages/grafana-ui/src/components/Forms/Form.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/Form.story.tsx
@@ -19,7 +19,7 @@ import { boolean } from '@storybook/addon-knobs';
 import { TextArea } from './TextArea/TextArea';
 
 export default {
-  title: 'Forms/Test forms',
+  title: 'Forms/Example forms',
   decorators: [withStoryContainer, withCenteredStory],
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Forms/Label.story.tsx b/packages/grafana-ui/src/components/Forms/Label.story.tsx
deleted file mode 100644
index 4fa7a321e13..00000000000
--- a/packages/grafana-ui/src/components/Forms/Label.story.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-
-import { text } from '@storybook/addon-knobs';
-
-import { Label } from './Label';
-
-const getKnobs = () => {
-  return {
-    label: text('text', 'Form element label'),
-    description: text('description', 'Description of the form field'),
-  };
-};
-
-export default {
-  title: 'Forms',
-  component: Label,
-};
-
-export const simple = () => {
-  const { label, description } = getKnobs();
-
-  return <Label description={description}>{label}</Label>;
-};
diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.story.tsx b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.story.tsx
deleted file mode 100644
index 303a8557d78..00000000000
--- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.story.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React, { useState } from 'react';
-import { RadioButton, RadioButtonSize } from './RadioButton';
-import { boolean, select } from '@storybook/addon-knobs';
-
-export default {
-  title: 'Forms/RadioButton',
-  component: RadioButton,
-};
-
-const sizes: RadioButtonSize[] = ['sm', 'md'];
-
-export const simple = () => {
-  const [active, setActive] = useState();
-  const BEHAVIOUR_GROUP = 'Behaviour props';
-  const disabled = boolean('Disabled', false, BEHAVIOUR_GROUP);
-  const VISUAL_GROUP = 'Visual options';
-  const size = select<RadioButtonSize>('Size', sizes, 'md', VISUAL_GROUP);
-
-  return (
-    <RadioButton
-      disabled={disabled}
-      size={size}
-      active={active}
-      id="standalone"
-      onChange={() => {
-        setActive(!active);
-      }}
-    >
-      Radio button
-    </RadioButton>
-  );
-};
diff --git a/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx b/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
index 46fb3cc619b..c6bc38c5b1c 100644
--- a/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
+++ b/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
@@ -6,7 +6,7 @@ import { Tab } from './Tab';
 import { TabContent } from './TabContent';
 
 export default {
-  title: 'General/Tabs/TabsExample',
+  title: 'General/Tabs',
   decorators: [withCenteredStory],
 };
 
diff --git a/packages/grafana-ui/src/components/Tabs/TabsBar.story.tsx b/packages/grafana-ui/src/components/Tabs/TabsBar.story.tsx
deleted file mode 100644
index 76a47b31cdc..00000000000
--- a/packages/grafana-ui/src/components/Tabs/TabsBar.story.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import { select } from '@storybook/addon-knobs';
-import { TabsBar } from './TabsBar';
-import { Tab } from './Tab';
-import { UseState } from '../../utils/storybook/UseState';
-import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
-import mdx from './TabsBar.mdx';
-
-export default {
-  title: 'General/Tabs/TabsBar',
-  component: TabsBar,
-  decorators: [withCenteredStory],
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-  },
-};
-
-const tabs = [
-  { label: '1st child', key: 'first', active: true },
-  { label: '2nd child', key: 'second', active: false },
-  { label: '3rd child', key: 'third', active: false },
-];
-
-export const Simple = () => {
-  const VISUAL_GROUP = 'Visual options';
-  // ---
-  const icon = select(
-    'Icon',
-    { None: undefined, Heart: 'fa fa-heart', Star: 'fa fa-star', User: 'fa fa-user' },
-    undefined,
-    VISUAL_GROUP
-  );
-  return (
-    <UseState initialState={tabs}>
-      {(state, updateState) => {
-        return (
-          <TabsBar>
-            {state.map((tab, index) => {
-              return (
-                <Tab
-                  key={index}
-                  label={tab.label}
-                  active={tab.active}
-                  icon={icon}
-                  onChangeTab={() => updateState(state.map((tab, idx) => ({ ...tab, active: idx === index })))}
-                />
-              );
-            })}
-          </TabsBar>
-        );
-      }}
-    </UseState>
-  );
-};