diff --git a/packages/grafana-ui/src/components/Forms/index.ts b/packages/grafana-ui/src/components/Forms/index.ts
deleted file mode 100644
index 64b4095f789..00000000000
--- a/packages/grafana-ui/src/components/Forms/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { getFormStyles } from './getFormStyles';
-import { Label } from './Label';
-import { RadioButtonGroup } from './RadioButtonGroup/RadioButtonGroup';
-import { Form } from './Form';
-import { Field } from './Field';
-import { Legend } from './Legend';
-import { Checkbox } from './Checkbox';
-import { InputControl } from '../InputControl';
-
-const Forms = {
-  RadioButtonGroup,
-  getFormStyles,
-  Label,
-  Form,
-  Field,
-  InputControl,
-  Checkbox,
-  Legend,
-};
-
-export default Forms;
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 5fd4b0ea292..75a082baec9 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -123,7 +123,6 @@ export { SelectValueEditor } from './OptionsUI/select';
 export { FieldConfigItemHeaderTitle } from './FieldConfigs/FieldConfigItemHeaderTitle';
 
 // Next-gen forms
-export { default as Forms } from './Forms';
 export { Form } from './Forms/Form';
 export { InputControl } from './InputControl';
 export * from './Button';
diff --git a/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx b/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
index 04ca75ae0d5..776dc91e137 100644
--- a/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
+++ b/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import { dateTimeFormat } from '@grafana/data';
-import { Forms, Form } from '@grafana/ui';
+import { Legend, Form } from '@grafana/ui';
 import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux';
 import { ImportDashboardForm } from './ImportDashboardForm';
 import { clearLoadedDashboard, saveDashboard } from '../state/actions';
@@ -54,7 +54,7 @@ class ImportDashboardOverviewUnConnected extends PureComponent<Props, State> {
         {source === DashboardSource.Gcom && (
           <div style={{ marginBottom: '24px' }}>
             <div>
-              <Forms.Legend>
+              <Legend>
                 Importing Dashboard from{' '}
                 <a
                   href={`https://grafana.com/dashboards/${dashboard.gnetId}`}
@@ -63,7 +63,7 @@ class ImportDashboardOverviewUnConnected extends PureComponent<Props, State> {
                 >
                   Grafana.com
                 </a>
-              </Forms.Legend>
+              </Legend>
             </div>
             <table className="filter-table form-inline">
               <tbody>