diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx
index 9f2495666e0..0f772486752 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx
@@ -1,10 +1,7 @@
-import { css } from '@emotion/css';
 import React, { FC } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { HorizontalGroup, InlineField, InlineLabel, PopoverContent, Select } from '@grafana/ui';
-
-import { INNER_LABEL_WIDTH, LABEL_WIDTH } from '../constants';
+import { InlineField, Select } from '@grafana/ui';
 
 interface VariableQueryFieldProps {
   onChange: (value: string) => void;
@@ -33,60 +30,3 @@ export const VariableQueryField: FC<VariableQueryFieldProps> = ({
     </InlineField>
   );
 };
-
-export interface Props {
-  children: React.ReactNode;
-  tooltip?: PopoverContent;
-  label?: React.ReactNode;
-  className?: string;
-  noFillEnd?: boolean;
-  labelWidth?: number;
-  fillComponent?: React.ReactNode;
-  htmlFor?: string;
-}
-
-export const QueryEditorRow: FC<Props> = ({
-  children,
-  label,
-  tooltip,
-  fillComponent,
-  noFillEnd = false,
-  labelWidth = LABEL_WIDTH,
-  htmlFor,
-  ...rest
-}) => {
-  return (
-    <div className="gf-form" {...rest}>
-      {label && (
-        <InlineLabel width={labelWidth} tooltip={tooltip} htmlFor={htmlFor}>
-          {label}
-        </InlineLabel>
-      )}
-      <div
-        className={css`
-          margin-right: 4px;
-        `}
-      >
-        <HorizontalGroup spacing="xs" width="auto">
-          {children}
-        </HorizontalGroup>
-      </div>
-      <div className={'gf-form--grow'}>
-        {noFillEnd || <div className={'gf-form-label gf-form-label--grow'}>{fillComponent}</div>}
-      </div>
-    </div>
-  );
-};
-
-export const QueryEditorField: FC<Props> = ({ children, label, tooltip, labelWidth = INNER_LABEL_WIDTH, ...rest }) => {
-  return (
-    <>
-      {label && (
-        <InlineLabel width={labelWidth} tooltip={tooltip} {...rest}>
-          {label}
-        </InlineLabel>
-      )}
-      {children}
-    </>
-  );
-};
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/index.ts b/public/app/plugins/datasource/cloud-monitoring/components/index.ts
index a4e3e6d33fb..1651a77898c 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/index.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/components/index.ts
@@ -10,7 +10,7 @@ export { Aggregation } from './Aggregation';
 export { MetricQueryEditor } from './MetricQueryEditor';
 export { SLOQueryEditor } from './SLOQueryEditor';
 export { MQLQueryEditor } from './MQLQueryEditor';
-export { VariableQueryField, QueryEditorRow, QueryEditorField } from './Fields';
+export { VariableQueryField } from './Fields';
 export { VisualMetricQueryEditor } from './VisualMetricQueryEditor';
 export { PeriodSelect } from './PeriodSelect';
 export { Preprocessor } from './Preprocessor';