diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts
index 2cefae622b7..c05d6d0e32d 100644
--- a/packages/grafana-data/src/index.ts
+++ b/packages/grafana-data/src/index.ts
@@ -26,6 +26,3 @@ export { PanelPlugin, SetFieldConfigOptionsArgs, StandardOptionConfig } from './
 export { createFieldConfigRegistry } from './panel/registryFactories';
 export { QueryRunner, QueryRunnerOptions } from './types/queryRunner';
 export { GroupingToMatrixTransformerOptions } from './transformations/transformers/groupingToMatrix';
-
-// Moved to `@grafana/schema`, in Grafana 9, this will be removed
-export * from './schema';
diff --git a/packages/grafana-data/src/schema.ts b/packages/grafana-data/src/schema.ts
deleted file mode 100644
index abd505098f3..00000000000
--- a/packages/grafana-data/src/schema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Moved to `@grafana/schema`, in Grafana 9, this will be removed
-//---------------------------------------------------------------
-// grafana/grafana/packages/grafana-schema$ grep export src/schema/*.ts
-/**
- * @deprecated Moved to `@grafana/schema` package and will be removed in Grafana 9
- * @public
- */
-export {
-  // Styles that changed
-  VizTextDisplayOptions as TextDisplayOptions, // rename
-} from '@grafana/schema';
diff --git a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
index 6155bacad5a..4971d4f2323 100644
--- a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
+++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
@@ -14,12 +14,12 @@ import {
   GAUGE_DEFAULT_MAXIMUM,
   GAUGE_DEFAULT_MINIMUM,
   getFieldColorMode,
-  TextDisplayOptions,
   ThresholdsMode,
   TimeSeriesValue,
   VizOrientation,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { VizTextDisplayOptions } from '@grafana/schema';
 
 import { Themeable2 } from '../../types';
 import { calculateFontSize, measureText } from '../../utils/measureText';
@@ -39,7 +39,7 @@ export interface Props extends Themeable2 {
   display?: DisplayProcessor;
   value: DisplayValue;
   orientation: VizOrientation;
-  text?: TextDisplayOptions;
+  text?: VizTextDisplayOptions;
   itemSpacing?: number;
   lcdCellWidth?: number;
   displayMode: BarGaugeDisplayMode;
@@ -609,7 +609,7 @@ function getValueStyles(
   width: number,
   height: number,
   orientation: VizOrientation,
-  text?: TextDisplayOptions
+  text?: VizTextDisplayOptions
 ): CSSProperties {
   const styles: CSSProperties = {
     color,
diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.tsx b/packages/grafana-ui/src/components/BigValue/BigValue.tsx
index 789bd7fd93a..da3088dab94 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValue.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValue.tsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 
-import { DisplayValue, DisplayValueAlignmentFactors, FieldSparkline, TextDisplayOptions } from '@grafana/data';
+import { DisplayValue, DisplayValueAlignmentFactors, FieldSparkline } from '@grafana/data';
+import { VizTextDisplayOptions } from '@grafana/schema';
 
 import { Themeable2 } from '../../types';
 import { FormattedValueDisplay } from '../FormattedValueDisplay/FormattedValueDisplay';
@@ -57,7 +58,7 @@ export interface Props extends Themeable2 {
   /** Factors that should influence the positioning of the text  */
   alignmentFactors?: DisplayValueAlignmentFactors;
   /** Explicit font size control */
-  text?: TextDisplayOptions;
+  text?: VizTextDisplayOptions;
   /** Specify which text should be visible in the BigValue */
   textMode?: BigValueTextMode;
   /** If true disables the tooltip */
diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
index 709cd81ea09..906ca0d7f7f 100644
--- a/packages/grafana-ui/src/components/Gauge/Gauge.tsx
+++ b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
@@ -8,8 +8,8 @@ import {
   ThresholdsMode,
   GAUGE_DEFAULT_MAXIMUM,
   GAUGE_DEFAULT_MINIMUM,
-  TextDisplayOptions,
 } from '@grafana/data';
+import { VizTextDisplayOptions } from '@grafana/schema';
 
 import { Themeable } from '../../types';
 import { calculateFontSize } from '../../utils/measureText';
@@ -23,7 +23,7 @@ export interface Props extends Themeable {
   showThresholdLabels: boolean;
   width: number;
   value: DisplayValue;
-  text?: TextDisplayOptions;
+  text?: VizTextDisplayOptions;
   onClick?: React.MouseEventHandler<HTMLElement>;
   className?: string;
 }