diff --git a/src/dev/code_coverage/ingest_coverage/__tests__/mocks/team_assign_mock.txt b/src/dev/code_coverage/ingest_coverage/__tests__/mocks/team_assign_mock.txt
index 15d3eb058bcf3a..b04178ec71c6f3 100644
--- a/src/dev/code_coverage/ingest_coverage/__tests__/mocks/team_assign_mock.txt
+++ b/src/dev/code_coverage/ingest_coverage/__tests__/mocks/team_assign_mock.txt
@@ -61,9 +61,6 @@ x-pack/plugins/lens/public/datatable_visualization/expression.tsx kibana-app
 x-pack/plugins/lens/public/datatable_visualization/index.ts kibana-app
 x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx kibana-app
 x-pack/plugins/lens/public/datatable_visualization/visualization.tsx kibana-app
-x-pack/plugins/lens/public/debounced_component/debounced_component.test.tsx kibana-app
-x-pack/plugins/lens/public/debounced_component/debounced_component.tsx kibana-app
-x-pack/plugins/lens/public/debounced_component/index.ts kibana-app
 x-pack/plugins/lens/public/drag_drop/drag_drop.test.tsx kibana-app
 x-pack/plugins/lens/public/drag_drop/drag_drop.tsx kibana-app
 x-pack/plugins/lens/public/drag_drop/index.ts kibana-app
diff --git a/src/plugins/chart_expressions/expression_legacy_metric/public/__stories__/metric_renderer.stories.tsx b/src/plugins/chart_expressions/expression_legacy_metric/public/__stories__/metric_renderer.stories.tsx
index 46bc90eda35c96..72e52ef303f4c2 100644
--- a/src/plugins/chart_expressions/expression_legacy_metric/public/__stories__/metric_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_legacy_metric/public/__stories__/metric_renderer.stories.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { from } from 'rxjs';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
-import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
+import { Datatable, DatatableColumn, TextAlignment } from '@kbn/expressions-plugin/common';
 import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { getFormatService } from '../__mocks__/format_service';
@@ -209,8 +209,11 @@ storiesOf('renderers/visMetric', module)
               },
               labels: {
                 show: false,
-                // @ts-expect-error upgrade typescript v4.9.5
-                style: { spec: { fontSize: '60px', align: 'left' }, type: 'style', css: '' },
+                style: {
+                  spec: { fontSize: '60px', textAlign: TextAlignment.LEFT },
+                  type: 'style',
+                  css: '',
+                },
                 position: LabelPosition.TOP,
               },
             },
diff --git a/src/plugins/chart_expressions/expression_legacy_metric/public/components/with_auto_scale.tsx b/src/plugins/chart_expressions/expression_legacy_metric/public/components/with_auto_scale.tsx
index f0d21374588f70..36093abaddf5a4 100644
--- a/src/plugins/chart_expressions/expression_legacy_metric/public/components/with_auto_scale.tsx
+++ b/src/plugins/chart_expressions/expression_legacy_metric/public/components/with_auto_scale.tsx
@@ -63,10 +63,13 @@ function hasAutoscaleProps<T>(props: T): props is T & AutoScaleProps {
   return false;
 }
 
-function getWrappedComponentProps<T>(props: T) {
+function getWrappedComponentProps<T>(props: T): T {
   if (hasAutoscaleProps(props)) {
-    const { autoScaleParams, renderComplete, ...rest } = props;
-    return rest;
+    return {
+      ...props,
+      autoScaleParams: undefined,
+      renderComplete: undefined,
+    };
   }
 
   return props;
@@ -132,8 +135,7 @@ export function withAutoScale<T>(WrappedComponent: ComponentType<T>) {
               : {}),
           }}
         >
-          {/* @ts-expect-error upgrade typescript v4.9.5*/}
-          <WrappedComponent {...(restProps as T)} />
+          <WrappedComponent {...restProps} />
         </div>
       </div>
     );
diff --git a/src/plugins/expressions/common/execution/execution_contract.ts b/src/plugins/expressions/common/execution/execution_contract.ts
index ad5172356fe4e9..50dda43661367f 100644
--- a/src/plugins/expressions/common/execution/execution_contract.ts
+++ b/src/plugins/expressions/common/execution/execution_contract.ts
@@ -17,17 +17,19 @@ import { ExpressionAstExpression } from '../ast';
  * `ExecutionContract` is a wrapper around `Execution` class. It provides the
  * same functionality but does not expose Expressions plugin internals.
  */
-export class ExecutionContract<Input = unknown, Output = unknown, InspectorAdapters = unknown> {
+export class ExecutionContract<
+  Input = unknown,
+  Output = unknown,
+  InspectorAdapters extends Adapters = object
+> {
   public get isPending(): boolean {
     const { state, result } = this.execution.state.get();
     const finished = state === 'error' || (state === 'result' && !result?.partial);
     return !finished;
   }
 
-  // @ts-expect-error upgrade typescript v4.9.5
   protected readonly execution: Execution<Input, Output, InspectorAdapters>;
 
-  // @ts-expect-error upgrade typescript v4.9.5
   constructor(execution: Execution<Input, Output, InspectorAdapters>) {
     this.execution = execution;
   }
@@ -82,6 +84,5 @@ export class ExecutionContract<Input = unknown, Output = unknown, InspectorAdapt
    * Get Inspector adapters provided to all functions of expression through
    * execution context.
    */
-  // @ts-expect-error upgrade typescript v4.9.5
   inspect = (): Adapters => this.execution.inspectorAdapters;
 }
diff --git a/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
index 22311712caab04..66d71693cdcbd4 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
@@ -13,6 +13,7 @@ import { FormattedColumn, TableVisConfig, TableVisUiState } from '../types';
 import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { createTableVisCell } from './table_vis_cell';
 import { createGridColumns } from './table_vis_columns';
+import { EuiDataGridProps } from '@elastic/eui';
 
 jest.mock('./table_vis_columns', () => ({
   createGridColumns: jest.fn(() => []),
@@ -107,8 +108,8 @@ describe('TableVisBasic', () => {
       undefined
     );
 
-    // @ts-expect-error upgrade typescript v4.9.5
-    const { onSort } = comp.find('EuiDataGrid').prop('sorting');
+    const { onSort } = comp.find('EuiDataGrid').prop<EuiDataGridProps['sorting']>('sorting')!;
+
     // sort the first column
     onSort([{ id: 'first', direction: 'asc' }]);
     expect(uiStateProps.setSort).toHaveBeenCalledWith({ columnIndex: 0, direction: 'asc' });
diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/percentile.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/percentile.ts
index f18de61707886d..1cc36538798029 100644
--- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/percentile.ts
+++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/percentile.ts
@@ -49,19 +49,20 @@ export const convertToPercentileColumn = (
     return null;
   }
   const commonColumnParams = createColumn(series, metric, field, { reducedTimeRange, timeShift });
+  const meta: PercentileColumn['meta'] =
+    index !== undefined
+      ? {
+          reference: `${metric.id}.${index}`,
+          ...commonColumnParams.meta,
+        }
+      : commonColumnParams.meta;
+
   return {
     operationType: 'percentile',
     sourceField: field.name,
     ...commonColumnParams,
     params: { ...params, ...getFormat(series) },
-    // @ts-expect-error upgrade typescript v4.9.5
-    meta:
-      index !== undefined
-        ? {
-            reference: `${metric.id}.${index}`,
-            ...commonColumnParams.meta,
-          }
-        : commonColumnParams.meta,
+    meta,
   };
 };
 
diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/percentile_rank.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/percentile_rank.ts
index 54ac8e11dd7677..27f9c021c56cae 100644
--- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/percentile_rank.ts
+++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/percentile_rank.ts
@@ -19,6 +19,7 @@ import {
   Column,
   PercentileRanksColumnWithExtendedMeta,
   CommonColumnConverterArgs,
+  PercentileColumn,
 } from './types';
 
 export const isPercentileRanksColumnWithMeta = (
@@ -56,19 +57,19 @@ export const convertToPercentileRankColumn = (
   }
 
   const commonColumnParams = createColumn(series, metric, field, { reducedTimeRange, timeShift });
+  const meta: PercentileColumn['meta'] =
+    index !== undefined
+      ? {
+          reference: `${metric.id}.${index}`,
+          ...commonColumnParams.meta,
+        }
+      : commonColumnParams.meta;
   return {
     operationType: 'percentile_rank',
     sourceField: field.name,
     ...commonColumnParams,
     params: { ...params, ...getFormat(series) },
-    // @ts-expect-error upgrade typescript v4.9.5
-    meta:
-      index !== undefined
-        ? {
-            reference: `${metric.id}.${index}`,
-            ...commonColumnParams.meta,
-          }
-        : commonColumnParams.meta,
+    meta,
   };
 };
 
diff --git a/src/plugins/visualizations/public/convert_to_lens/schemas.ts b/src/plugins/visualizations/public/convert_to_lens/schemas.ts
index 886be04bb654ac..cd0c3b25604671 100644
--- a/src/plugins/visualizations/public/convert_to_lens/schemas.ts
+++ b/src/plugins/visualizations/public/convert_to_lens/schemas.ts
@@ -8,7 +8,7 @@
 
 import type { DataView } from '@kbn/data-views-plugin/common';
 import { IAggConfig, METRIC_TYPES, TimefilterContract } from '@kbn/data-plugin/public';
-import { AggBasedColumn, PercentageModeConfig, SchemaConfig } from '../../common';
+import { AggBasedColumn, PercentageModeConfig, SchemaConfig, VisParams } from '../../common';
 import { convertMetricToColumns } from '../../common/convert_to_lens/lib/metrics';
 import {
   getAggIdAndValue,
@@ -133,8 +133,8 @@ const createLayer = (
   };
 };
 
-export const getColumnsFromVis = <T>(
-  vis: Vis<T>,
+export const getColumnsFromVis = <TVisParams extends VisParams>(
+  vis: Vis<TVisParams>,
   timefilter: TimefilterContract,
   dataView: DataView,
   {
diff --git a/src/plugins/visualizations/public/types.ts b/src/plugins/visualizations/public/types.ts
index f00777c5ef957d..29c8ca2e1b8268 100644
--- a/src/plugins/visualizations/public/types.ts
+++ b/src/plugins/visualizations/public/types.ts
@@ -80,7 +80,7 @@ export interface VisToExpressionAstParams {
   abortSignal?: AbortSignal;
 }
 
-export type VisToExpressionAst<TVisParams = VisParams> = (
+export type VisToExpressionAst<TVisParams extends VisParams = VisParams> = (
   vis: Vis<TVisParams>,
   params: VisToExpressionAstParams
 ) => Promise<ExpressionAstExpression> | ExpressionAstExpression;
diff --git a/src/plugins/visualizations/public/vis.ts b/src/plugins/visualizations/public/vis.ts
index b02daa7c50fd0e..89e7282c4449e0 100644
--- a/src/plugins/visualizations/public/vis.ts
+++ b/src/plugins/visualizations/public/vis.ts
@@ -57,7 +57,7 @@ const getSearchSource = async (inputSearchSource: ISearchSource, savedSearchId?:
 
 type PartialVisState = Assign<SerializedVis, { data: Partial<SerializedVisData> }>;
 
-export class Vis<TVisParams = VisParams> {
+export class Vis<TVisParams extends VisParams = VisParams> {
   public readonly type: BaseVisType<TVisParams>;
   public readonly id?: string;
   public title: string = '';
@@ -69,7 +69,6 @@ export class Vis<TVisParams = VisParams> {
 
   constructor(visType: string, visState: SerializedVis<TVisParams> = {} as any) {
     this.type = this.getType(visType);
-    // @ts-expect-error upgrade typescript v4.9.5
     this.params = this.getParams(visState.params);
     this.uiState = new PersistedState(visState.uiState);
     this.id = visState.id;
@@ -192,7 +191,6 @@ export class Vis<TVisParams = VisParams> {
       title: this.title,
       description: this.description,
       type: this.type.name,
-      // @ts-expect-error upgrade typescript v4.9.5
       params: cloneDeep(this.params),
       uiState: this.uiState.toJSON(),
       data: {
diff --git a/src/plugins/visualizations/public/vis_async.ts b/src/plugins/visualizations/public/vis_async.ts
index 8f2f92cc36db71..4e295596b1611f 100644
--- a/src/plugins/visualizations/public/vis_async.ts
+++ b/src/plugins/visualizations/public/vis_async.ts
@@ -9,7 +9,7 @@
 import type { SerializedVis } from './vis';
 import type { VisParams } from '../common';
 
-export const createVisAsync = async <TVisParams = VisParams>(
+export const createVisAsync = async <TVisParams extends VisParams = VisParams>(
   visType: string,
   visState: SerializedVis<TVisParams> = {} as any
 ) => {
@@ -20,7 +20,6 @@ export const createVisAsync = async <TVisParams = VisParams>(
   const { Vis } = await import('./vis');
   const vis = new Vis(visType, visState);
 
-  // @ts-expect-error upgrade typescript v4.9.5
   await vis.setState(visState);
   return vis;
 };
diff --git a/src/plugins/visualizations/public/vis_editors_registry.ts b/src/plugins/visualizations/public/vis_editors_registry.ts
index 627490f3f99bf5..d03f092d51baa3 100644
--- a/src/plugins/visualizations/public/vis_editors_registry.ts
+++ b/src/plugins/visualizations/public/vis_editors_registry.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { VisParams } from '../common';
 import { VisEditorConstructor } from './visualize_app/types';
 
 const DEFAULT_NAME = 'default';
@@ -17,7 +18,10 @@ export const createVisEditorsRegistry = () => {
     registerDefault: (editor: VisEditorConstructor) => {
       map.set(DEFAULT_NAME, editor);
     },
-    register: <TVisParams>(name: string, editor: VisEditorConstructor<TVisParams>) => {
+    register: <TVisParams extends VisParams>(
+      name: string,
+      editor: VisEditorConstructor<TVisParams>
+    ) => {
       if (name) {
         map.set(name, editor);
       }
diff --git a/src/plugins/visualizations/public/vis_schemas.ts b/src/plugins/visualizations/public/vis_schemas.ts
index cd8bd9bc386a86..72cee5a3ce06be 100644
--- a/src/plugins/visualizations/public/vis_schemas.ts
+++ b/src/plugins/visualizations/public/vis_schemas.ts
@@ -14,7 +14,7 @@ import {
 } from '@kbn/data-plugin/common';
 import { search } from '@kbn/data-plugin/public';
 import { Vis, VisToExpressionAstParams } from './types';
-import { SchemaConfig } from '../common/types';
+import { SchemaConfig, VisParams } from '../common/types';
 import { convertToSchemaConfig } from '../common';
 
 const { isDateHistogramBucketAggConfig } = search.aggs;
@@ -76,7 +76,7 @@ const createSchemaConfig = (
   return { ...convertToSchemaConfig(updatedAgg), accessor };
 };
 
-export const getVisSchemas = <TVisParams>(
+export const getVisSchemas = <TVisParams extends VisParams>(
   vis: Vis<TVisParams>,
   params: VisToExpressionAstParams
 ): Schemas => {
diff --git a/src/plugins/visualizations/public/vis_types/base_vis_type.ts b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
index 2625781c264296..26801421159b31 100644
--- a/src/plugins/visualizations/public/vis_types/base_vis_type.ts
+++ b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
@@ -21,7 +21,7 @@ const defaultOptions: VisTypeOptions = {
   hierarchicalData: false, // we should get rid of this i guess ?
 };
 
-export class BaseVisType<TVisParams = VisParams> {
+export class BaseVisType<TVisParams extends VisParams = VisParams> {
   public readonly name;
   public readonly title;
   public readonly description;
diff --git a/src/plugins/visualizations/public/vis_types/types.ts b/src/plugins/visualizations/public/vis_types/types.ts
index 90f64276adf763..2f689cb81aee02 100644
--- a/src/plugins/visualizations/public/vis_types/types.ts
+++ b/src/plugins/visualizations/public/vis_types/types.ts
@@ -79,7 +79,7 @@ interface CustomEditorConfig {
  * A visualization type definition representing a spec of one specific type of "classical"
  * visualizations (i.e. not Lens visualizations).
  */
-export interface VisTypeDefinition<TVisParams> {
+export interface VisTypeDefinition<TVisParams extends VisParams> {
   /**
    * Visualization unique name
    */
diff --git a/src/plugins/visualizations/public/vis_types/types_service.ts b/src/plugins/visualizations/public/vis_types/types_service.ts
index 4b20dcc1569c5e..282c9b65bfe941 100644
--- a/src/plugins/visualizations/public/vis_types/types_service.ts
+++ b/src/plugins/visualizations/public/vis_types/types_service.ts
@@ -10,6 +10,7 @@ import { visTypeAliasRegistry, VisTypeAlias } from './vis_type_alias_registry';
 import { BaseVisType } from './base_vis_type';
 import { VisTypeDefinition } from './types';
 import { VisGroups } from './vis_groups_enum';
+import { VisParams } from '../../common';
 
 /**
  * Vis Types Service
@@ -19,7 +20,9 @@ import { VisGroups } from './vis_groups_enum';
 export class TypesService {
   private types: Record<string, BaseVisType<any>> = {};
 
-  private registerVisualization<TVisParam>(visDefinition: BaseVisType<TVisParam>) {
+  private registerVisualization<TVisParam extends VisParams>(
+    visDefinition: BaseVisType<TVisParam>
+  ) {
     if (this.types[visDefinition.name]) {
       throw new Error('type already exists!');
     }
@@ -32,7 +35,9 @@ export class TypesService {
        * registers a visualization type
        * @param config - visualization type definition
        */
-      createBaseVisualization: <TVisParams>(config: VisTypeDefinition<TVisParams>): void => {
+      createBaseVisualization: <TVisParams extends VisParams>(
+        config: VisTypeDefinition<TVisParams>
+      ): void => {
         const vis = new BaseVisType(config);
         this.registerVisualization(vis);
       },
@@ -51,7 +56,9 @@ export class TypesService {
        * returns specific visualization or undefined if not found
        * @param {string} visualization - id of visualization to return
        */
-      get: <TVisParams>(visualization: string): BaseVisType<TVisParams> | undefined => {
+      get: <TVisParams extends VisParams>(
+        visualization: string
+      ): BaseVisType<TVisParams> | undefined => {
         return this.types[visualization];
       },
       /**
diff --git a/src/plugins/visualizations/public/visualize_app/types.ts b/src/plugins/visualizations/public/visualize_app/types.ts
index abc55e3e671fec..7e91cd4ce2bd01 100644
--- a/src/plugins/visualizations/public/visualize_app/types.ts
+++ b/src/plugins/visualizations/public/visualize_app/types.ts
@@ -137,7 +137,7 @@ export type SavedVisInstance = VisInstance;
 export type ByValueVisInstance = VisInstance;
 export type VisualizeEditorVisInstance = SavedVisInstance | ByValueVisInstance;
 
-export type VisEditorConstructor<TVisParams = VisParams> = new (
+export type VisEditorConstructor<TVisParams extends VisParams = VisParams> = new (
   element: HTMLElement,
   vis: Vis<TVisParams>,
   eventEmitter: EventEmitter,
diff --git a/src/plugins/visualizations/public/wizard/agg_based_selection/agg_based_selection.test.tsx b/src/plugins/visualizations/public/wizard/agg_based_selection/agg_based_selection.test.tsx
index 208eefe941528c..46100397e26653 100644
--- a/src/plugins/visualizations/public/wizard/agg_based_selection/agg_based_selection.test.tsx
+++ b/src/plugins/visualizations/public/wizard/agg_based_selection/agg_based_selection.test.tsx
@@ -10,6 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { TypesStart, BaseVisType, VisGroups } from '../../vis_types';
 import { AggBasedSelection } from './agg_based_selection';
+import { VisParams } from '../../../common';
 
 describe('AggBasedSelection', () => {
   const defaultVisTypeParams = {
@@ -47,7 +48,7 @@ describe('AggBasedSelection', () => {
   ] as BaseVisType[];
 
   const visTypes: TypesStart = {
-    get<T>(id: string): BaseVisType<T> {
+    get<T extends VisParams>(id: string): BaseVisType<T> {
       return _visTypes.find((vis) => vis.name === id) as unknown as BaseVisType<T>;
     },
     all: () => _visTypes,
diff --git a/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx b/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
index a9a21446e06a20..33955b6f2995f2 100644
--- a/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
+++ b/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
@@ -11,6 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { TypesStart, BaseVisType, VisGroups } from '../../vis_types';
 import { GroupSelection } from './group_selection';
 import { DocLinksStart } from '@kbn/core/public';
+import { VisParams } from '../../../common';
 
 describe('GroupSelection', () => {
   const defaultVisTypeParams = {
@@ -61,7 +62,7 @@ describe('GroupSelection', () => {
 
   const visTypesRegistry = (visTypes: BaseVisType[]): TypesStart => {
     return {
-      get<T>(id: string): BaseVisType<T> {
+      get<T extends VisParams>(id: string): BaseVisType<T> {
         return visTypes.find((vis) => vis.name === id) as unknown as BaseVisType<T>;
       },
       all: () => {
diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
index 0db5f66cc5c925..c2f9aed1ec0cca 100644
--- a/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
+++ b/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
@@ -13,6 +13,7 @@ import NewVisModal from './new_vis_modal';
 import { ApplicationStart, DocLinksStart } from '@kbn/core/public';
 import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { contentManagementMock } from '@kbn/content-management-plugin/public/mocks';
+import { VisParams } from '../../common';
 
 describe('NewVisModal', () => {
   const defaultVisTypeParams = {
@@ -61,7 +62,7 @@ describe('NewVisModal', () => {
     },
   ] as BaseVisType[];
   const visTypes: TypesStart = {
-    get<T>(id: string): BaseVisType<T> {
+    get<T extends VisParams>(id: string): BaseVisType<T> {
       return _visTypes.find((vis) => vis.name === id) as unknown as BaseVisType<T>;
     },
     all: () => _visTypes,
diff --git a/x-pack/plugins/lens/public/debounced_component/debounced_component.test.tsx b/x-pack/plugins/lens/public/debounced_component/debounced_component.test.tsx
deleted file mode 100644
index d52eb3c5780591..00000000000000
--- a/x-pack/plugins/lens/public/debounced_component/debounced_component.test.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
-import { debouncedComponent } from './debounced_component';
-import { act } from 'react-dom/test-utils';
-
-describe('debouncedComponent', () => {
-  test('immediately renders', () => {
-    const TestComponent = debouncedComponent(({ title }: { title: string }) => {
-      return <h1>{title}</h1>;
-    });
-    expect(mount(<TestComponent title="hoi" />).html()).toMatchInlineSnapshot(`"<h1>hoi</h1>"`);
-  });
-
-  test('debounces changes', async () => {
-    const TestComponent = debouncedComponent(({ title }: { title: string }) => {
-      return <h1>{title}</h1>;
-    }, 1);
-    const component = mount(<TestComponent title="there" />);
-    component.setProps({ title: 'yall' });
-    expect(component.text()).toEqual('there');
-    await act(async () => {
-      await new Promise((r) => setTimeout(r, 10));
-    });
-    expect(component.text()).toEqual('yall');
-  });
-});
diff --git a/x-pack/plugins/lens/public/debounced_component/debounced_component.tsx b/x-pack/plugins/lens/public/debounced_component/debounced_component.tsx
deleted file mode 100644
index 53f1f1722ab3a1..00000000000000
--- a/x-pack/plugins/lens/public/debounced_component/debounced_component.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useState, useMemo, useEffect, memo, FunctionComponent } from 'react';
-import { debounce } from 'lodash';
-
-/**
- * debouncedComponent wraps the specified React component, returning a component which
- * only renders once there is a pause in props changes for at least `delay` milliseconds.
- * During the debounce phase, it will return the previously rendered value.
- */
-export function debouncedComponent<TProps>(component: FunctionComponent<TProps>, delay = 256) {
-  const MemoizedComponent = memo(component) as unknown as FunctionComponent<TProps>;
-
-  return (props: TProps) => {
-    const [cachedProps, setCachedProps] = useState(props);
-    const debouncePropsChange = useMemo(() => debounce(setCachedProps, delay), [setCachedProps]);
-
-    // cancel debounced prop change if component has been unmounted in the meantime
-    useEffect(() => () => debouncePropsChange.cancel(), [debouncePropsChange]);
-    debouncePropsChange(props);
-
-    // @ts-expect-error upgrade typescript v4.9.5
-    return React.createElement(MemoizedComponent, cachedProps);
-  };
-}
diff --git a/x-pack/plugins/lens/public/debounced_component/index.ts b/x-pack/plugins/lens/public/debounced_component/index.ts
deleted file mode 100644
index 68d247b5e3b3f9..00000000000000
--- a/x-pack/plugins/lens/public/debounced_component/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export * from './debounced_component';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
index 930dd4940171c8..af3bdb62ab032d 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
@@ -18,11 +18,6 @@ import {
 } from '../../../mocks';
 
 import { mockDataPlugin, mountWithProvider } from '../../../mocks';
-jest.mock('../../../debounced_component', () => {
-  return {
-    debouncedComponent: (fn: unknown) => fn,
-  };
-});
 
 import { WorkspacePanel } from './workspace_panel';
 import { ReactWrapper } from 'enzyme';
diff --git a/x-pack/plugins/lens/public/state_management/lens_slice.ts b/x-pack/plugins/lens/public/state_management/lens_slice.ts
index 284db90d69551b..d0c6e0f38b20dd 100644
--- a/x-pack/plugins/lens/public/state_management/lens_slice.ts
+++ b/x-pack/plugins/lens/public/state_management/lens_slice.ts
@@ -1005,15 +1005,13 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
         activeVisualization.removeLayer &&
         state.visualization.state
       ) {
-        const updater = layerIds.reduce(
+        const updater = layerIds.reduce<unknown>(
           (acc, layerId) =>
-            // @ts-expect-error upgrade typescript v4.9.5
             activeVisualization.removeLayer ? activeVisualization.removeLayer(acc, layerId) : acc,
           state.visualization.state
         );
 
         state.visualization.state =
-          // @ts-expect-error upgrade typescript v4.9.5
           typeof updater === 'function' ? updater(current(state.visualization.state)) : updater;
       }
 
diff --git a/x-pack/plugins/lens/server/migrations/common_migrations.ts b/x-pack/plugins/lens/server/migrations/common_migrations.ts
index 0b7962280559e5..f6a683afc22973 100644
--- a/x-pack/plugins/lens/server/migrations/common_migrations.ts
+++ b/x-pack/plugins/lens/server/migrations/common_migrations.ts
@@ -502,7 +502,11 @@ export const commonMigratePartitionChartGroups = (
   }>
 ): LensDocShape850<{
   shape: string;
-  layers: Array<{ primaryGroups?: string[]; secondaryGroups?: string[] }>;
+  layers: Array<{
+    primaryGroups?: string[];
+    secondaryGroups?: string[];
+    [key: string]: unknown; // unknown carryover key/values
+  }>;
 }> => {
   if (
     attributes.state.visualization?.layers &&
@@ -514,7 +518,6 @@ export const commonMigratePartitionChartGroups = (
         ...attributes.state,
         visualization: {
           ...attributes.state.visualization,
-          // @ts-expect-error upgrade typescript v4.9.5
           layers: attributes.state.visualization.layers.map((l) => {
             const groups = l.groups;