diff --git a/core/block_svg.ts b/core/block_svg.ts
index f80d8ebb3..979de6774 100644
--- a/core/block_svg.ts
+++ b/core/block_svg.ts
@@ -12,13 +12,8 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BlockSvg');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './theme.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_selected.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './touch.js';
 
 import {Block} from './block.js';
 import * as blockAnimations from './block_animations.js';
diff --git a/core/bubble.ts b/core/bubble.ts
index 014997424..0652c852a 100644
--- a/core/bubble.ts
+++ b/core/bubble.ts
@@ -12,12 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Bubble');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './metrics_manager.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './workspace.js';
-
 import type {BlockDragSurfaceSvg} from './block_drag_surface.js';
 import type {BlockSvg} from './block_svg.js';
 import * as browserEvents from './browser_events.js';
diff --git a/core/bubble_dragger.ts b/core/bubble_dragger.ts
index 5782ff673..268d63c9f 100644
--- a/core/bubble_dragger.ts
+++ b/core/bubble_dragger.ts
@@ -12,11 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BubbleDragger');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './bubble.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './constants.js';
-
 import type {BlockDragSurfaceSvg} from './block_drag_surface.js';
 import {ComponentManager} from './component_manager.js';
 import type {CommentMove} from './events/events_comment_move.js';
diff --git a/core/comment.ts b/core/comment.ts
index b781e1d34..07ce093d8 100644
--- a/core/comment.ts
+++ b/core/comment.ts
@@ -12,18 +12,10 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Comment');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './block.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './workspace_svg.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_bubble_open.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './warning.js';
 
 import type {CommentModel} from './block.js';
 import type {BlockSvg} from './block_svg.js';
diff --git a/core/connection.ts b/core/connection.ts
index bb398968b..5f8ff8b79 100644
--- a/core/connection.ts
+++ b/core/connection.ts
@@ -12,9 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Connection');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './constants.js';
-
 import type {Block} from './block.js';
 import {ConnectionType} from './connection_type.js';
 import type {BlockMove} from './events/events_block_move.js';
diff --git a/core/connection_db.ts b/core/connection_db.ts
index 078ae961e..e2a2da999 100644
--- a/core/connection_db.ts
+++ b/core/connection_db.ts
@@ -14,9 +14,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ConnectionDB');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './constants.js';
-
 import {ConnectionType} from './connection_type.js';
 import type {IConnectionChecker} from './interfaces/i_connection_checker.js';
 import type {RenderedConnection} from './rendered_connection.js';
diff --git a/core/extensions.ts b/core/extensions.ts
index ee13bd420..ae9e3cc39 100644
--- a/core/extensions.ts
+++ b/core/extensions.ts
@@ -15,9 +15,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Extensions');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './mutator.js';
-
 import type {Block} from './block.js';
 import type {BlockSvg} from './block_svg.js';
 import {FieldDropdown} from './field_dropdown.js';
diff --git a/core/field.ts b/core/field.ts
index c58c2e191..f8e58f1ab 100644
--- a/core/field.ts
+++ b/core/field.ts
@@ -14,13 +14,8 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Field');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './shortcut_registry.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './gesture.js';
 
 import type {Block} from './block.js';
 import type {BlockSvg} from './block_svg.js';
diff --git a/core/flyout_vertical.ts b/core/flyout_vertical.ts
index c5bf5d33d..860379b77 100644
--- a/core/flyout_vertical.ts
+++ b/core/flyout_vertical.ts
@@ -12,11 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.VerticalFlyout');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './block.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './constants.js';
-
 import * as browserEvents from './browser_events.js';
 import * as dropDownDiv from './dropdowndiv.js';
 import {Flyout, FlyoutItem} from './flyout_base.js';
diff --git a/core/gesture.ts b/core/gesture.ts
index 20262b9d6..ab877eed8 100644
--- a/core/gesture.ts
+++ b/core/gesture.ts
@@ -13,8 +13,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Gesture');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './block_dragger.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_click.js';
 
diff --git a/core/interfaces/i_ast_node_location_with_block.ts b/core/interfaces/i_ast_node_location_with_block.ts
index 14a2e5e71..72ef94b78 100644
--- a/core/interfaces/i_ast_node_location_with_block.ts
+++ b/core/interfaces/i_ast_node_location_with_block.ts
@@ -13,10 +13,6 @@
 import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IASTNodeLocationWithBlock');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../block.js';
-
 import type {IASTNodeLocation} from './i_ast_node_location.js';
 import type {Block} from '../block.js';
 
diff --git a/core/interfaces/i_block_dragger.ts b/core/interfaces/i_block_dragger.ts
index e70cf7f2a..8fa4b9dda 100644
--- a/core/interfaces/i_block_dragger.ts
+++ b/core/interfaces/i_block_dragger.ts
@@ -14,14 +14,6 @@ import type {Coordinate} from '../utils/coordinate.js';
 import type {BlockSvg} from '../block_svg.js';
 goog.declareModuleId('Blockly.IBlockDragger');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../block_svg.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/coordinate.js';
-
-
 /**
  * A block dragger interface.
  *
diff --git a/core/interfaces/i_bounded_element.ts b/core/interfaces/i_bounded_element.ts
index 00e769ca6..8aae86285 100644
--- a/core/interfaces/i_bounded_element.ts
+++ b/core/interfaces/i_bounded_element.ts
@@ -13,11 +13,6 @@ import * as goog from '../../closure/goog/goog.js';
 import type {Rect} from '../utils/rect.js';
 goog.declareModuleId('Blockly.IBoundedElement');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/rect.js';
-
-
 /**
  * A bounded element interface.
  *
diff --git a/core/interfaces/i_bubble.ts b/core/interfaces/i_bubble.ts
index 2c861c325..f424af334 100644
--- a/core/interfaces/i_bubble.ts
+++ b/core/interfaces/i_bubble.ts
@@ -14,13 +14,6 @@ import type {Coordinate} from '../utils/coordinate.js';
 import type {BlockDragSurfaceSvg} from '../block_drag_surface.js';
 goog.declareModuleId('Blockly.IBubble');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../block_drag_surface.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/coordinate.js';
-
 import type {IContextMenu} from './i_contextmenu.js';
 import type {IDraggable} from './i_draggable.js';
 
diff --git a/core/interfaces/i_collapsible_toolbox_item.ts b/core/interfaces/i_collapsible_toolbox_item.ts
index ea1723f53..a7d8e9153 100644
--- a/core/interfaces/i_collapsible_toolbox_item.ts
+++ b/core/interfaces/i_collapsible_toolbox_item.ts
@@ -12,11 +12,6 @@
 import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ICollapsibleToolboxItem');
 
-/* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './i_toolbox_item.js';
-
 import type {ISelectableToolboxItem} from './i_selectable_toolbox_item.js';
 import type {IToolboxItem} from './i_toolbox_item.js';
 
diff --git a/core/interfaces/i_connection_checker.ts b/core/interfaces/i_connection_checker.ts
index edde750a6..deb3c59fa 100644
--- a/core/interfaces/i_connection_checker.ts
+++ b/core/interfaces/i_connection_checker.ts
@@ -15,14 +15,6 @@ import type {Connection} from '../connection.js';
 import type {RenderedConnection} from '../rendered_connection.js';
 goog.declareModuleId('Blockly.IConnectionChecker');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../connection.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../rendered_connection.js';
-
-
 /**
  * Class for connection type checking logic.
  *
diff --git a/core/interfaces/i_delete_area.ts b/core/interfaces/i_delete_area.ts
index b96d8afea..1d9752b05 100644
--- a/core/interfaces/i_delete_area.ts
+++ b/core/interfaces/i_delete_area.ts
@@ -13,11 +13,6 @@
 import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IDeleteArea');
 
-/* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './i_draggable.js';
-
 import type {IDragTarget} from './i_drag_target.js';
 import type {IDraggable} from './i_draggable.js';
 
diff --git a/core/interfaces/i_drag_target.ts b/core/interfaces/i_drag_target.ts
index e7014f45a..f1e1b3c97 100644
--- a/core/interfaces/i_drag_target.ts
+++ b/core/interfaces/i_drag_target.ts
@@ -17,14 +17,6 @@ import {IDraggable} from './i_draggable.js';
 
 goog.declareModuleId('Blockly.IDragTarget');
 
-/* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './i_draggable.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/rect.js';
-
 import type {IComponent} from './i_component.js';
 
 
diff --git a/core/interfaces/i_flyout.ts b/core/interfaces/i_flyout.ts
index ac2d9ca0f..825660686 100644
--- a/core/interfaces/i_flyout.ts
+++ b/core/interfaces/i_flyout.ts
@@ -12,19 +12,6 @@
 import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IFlyout');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/toolbox.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../block_svg.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/coordinate.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/svg.js';
-
 import type {WorkspaceSvg} from '../workspace_svg.js';
 import type {BlockSvg} from '../block_svg.js';
 import type {Coordinate} from '../utils/coordinate.js';
diff --git a/core/interfaces/i_keyboard_accessible.ts b/core/interfaces/i_keyboard_accessible.ts
index a91793a9a..d60fb0224 100644
--- a/core/interfaces/i_keyboard_accessible.ts
+++ b/core/interfaces/i_keyboard_accessible.ts
@@ -13,11 +13,6 @@ import * as goog from '../../closure/goog/goog.js';
 import {KeyboardShortcut} from '../shortcut_registry.js';
 goog.declareModuleId('Blockly.IKeyboardAccessible');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../shortcut_registry.js';
-
-
 /**
  * An interface for an object that handles keyboard shortcuts.
  *
diff --git a/core/interfaces/i_metrics_manager.ts b/core/interfaces/i_metrics_manager.ts
index e39e7e5d7..3988c4a85 100644
--- a/core/interfaces/i_metrics_manager.ts
+++ b/core/interfaces/i_metrics_manager.ts
@@ -15,17 +15,6 @@ import type {Size} from '../utils/size.js';
 import type {Metrics} from '../utils/metrics.js';
 goog.declareModuleId('Blockly.IMetricsManager');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../metrics_manager.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/metrics.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/size.js';
-
-
 /**
  * Interface for a metrics manager.
  *
diff --git a/core/interfaces/i_positionable.ts b/core/interfaces/i_positionable.ts
index dedac7763..7edf0c694 100644
--- a/core/interfaces/i_positionable.ts
+++ b/core/interfaces/i_positionable.ts
@@ -14,14 +14,6 @@ import type {Rect} from '../utils/rect.js';
 import type {UiMetrics} from '../metrics_manager.js';
 goog.declareModuleId('Blockly.IPositionable');
 
-/* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../metrics_manager.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/rect.js';
-
 import type {IComponent} from './i_component.js';
 
 
diff --git a/core/interfaces/i_selectable_toolbox_item.ts b/core/interfaces/i_selectable_toolbox_item.ts
index 93cea2c6d..e7fe06f86 100644
--- a/core/interfaces/i_selectable_toolbox_item.ts
+++ b/core/interfaces/i_selectable_toolbox_item.ts
@@ -13,10 +13,6 @@ import * as goog from '../../closure/goog/goog.js';
 import type {FlyoutItemInfoArray} from '../utils/toolbox';
 goog.declareModuleId('Blockly.ISelectableToolboxItem');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/toolbox.js';
-
 import type {IToolboxItem} from './i_toolbox_item.js';
 
 
diff --git a/core/interfaces/i_toolbox.ts b/core/interfaces/i_toolbox.ts
index 7d4a3bc85..fdc021f5a 100644
--- a/core/interfaces/i_toolbox.ts
+++ b/core/interfaces/i_toolbox.ts
@@ -12,19 +12,6 @@
 import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IToolbox');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../utils/toolbox.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './i_flyout.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './i_toolbox_item.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../workspace_svg.js';
-
 import type {IRegistrable} from './i_registrable.js';
 import type {IToolboxItem} from './i_toolbox_item.js';
 import type {ToolboxInfo} from '../utils/toolbox.js';
diff --git a/core/names.ts b/core/names.ts
index 10892f990..0a656fbcf 100644
--- a/core/names.ts
+++ b/core/names.ts
@@ -12,9 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Names');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './procedures.js';
-
 import {Msg} from './msg.js';
 // import * as Procedures from './procedures.js';
 import type {VariableMap} from './variable_map.js';
diff --git a/core/positionable_helpers.ts b/core/positionable_helpers.ts
index 937806379..035ba91cd 100644
--- a/core/positionable_helpers.ts
+++ b/core/positionable_helpers.ts
@@ -12,10 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.uiPosition');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './metrics_manager.js';
-
 import type {UiMetrics} from './metrics_manager.js';
 import {Scrollbar} from './scrollbar.js';
 import {Rect} from './utils/rect.js';
diff --git a/core/renderers/common/i_path_object.ts b/core/renderers/common/i_path_object.ts
index a668c6a2a..4159775a1 100644
--- a/core/renderers/common/i_path_object.ts
+++ b/core/renderers/common/i_path_object.ts
@@ -13,16 +13,6 @@
 import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.IPathObject');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../../block_svg.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../../connection.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../../theme.js';
-
 import type {BlockStyle} from '../../theme.js';
 
 import type {ConstantProvider} from './constants.js';
diff --git a/core/renderers/common/path_object.ts b/core/renderers/common/path_object.ts
index 43cc7125f..e88a314dd 100644
--- a/core/renderers/common/path_object.ts
+++ b/core/renderers/common/path_object.ts
@@ -12,10 +12,6 @@
 import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.PathObject');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../../theme.js';
-
 import type {BlockSvg} from '../../block_svg.js';
 import type {Connection} from '../../connection.js';
 import type {BlockStyle} from '../../theme.js';
diff --git a/core/renderers/geras/highlighter.ts b/core/renderers/geras/highlighter.ts
index 6dbc1e73d..4d36cbcff 100644
--- a/core/renderers/geras/highlighter.ts
+++ b/core/renderers/geras/highlighter.ts
@@ -13,10 +13,6 @@
 import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.Highlighter');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './renderer.js';
-
 import * as svgPaths from '../../utils/svg_paths.js';
 import type {ConstantProvider} from '../common/constants.js';
 import type {BottomRow} from '../measurables/bottom_row.js';
diff --git a/core/renderers/geras/path_object.ts b/core/renderers/geras/path_object.ts
index f331ff6d7..2ff30f784 100644
--- a/core/renderers/geras/path_object.ts
+++ b/core/renderers/geras/path_object.ts
@@ -12,10 +12,6 @@
 import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.PathObject');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../../theme.js';
-
 import type {BlockSvg} from '../../block_svg.js';
 import type {BlockStyle} from '../../theme.js';
 import * as colour from '../../utils/colour.js';
diff --git a/core/renderers/geras/renderer.ts b/core/renderers/geras/renderer.ts
index d0aca993c..604282a81 100644
--- a/core/renderers/geras/renderer.ts
+++ b/core/renderers/geras/renderer.ts
@@ -12,10 +12,6 @@
 import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.Renderer');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../common/constants.js';
-
 import type {BlockSvg} from '../../block_svg.js';
 import type {BlockStyle, Theme} from '../../theme.js';
 import * as blockRendering from '../common/block_rendering.js';
diff --git a/core/renderers/zelos/path_object.ts b/core/renderers/zelos/path_object.ts
index d021865ba..dcc4c0d3e 100644
--- a/core/renderers/zelos/path_object.ts
+++ b/core/renderers/zelos/path_object.ts
@@ -12,10 +12,6 @@
 import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.PathObject');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../../theme.js';
-
 import type {BlockSvg} from '../../block_svg.js';
 import type {Connection} from '../../connection.js';
 import type {BlockStyle} from '../../theme.js';
diff --git a/core/renderers/zelos/renderer.ts b/core/renderers/zelos/renderer.ts
index 19610426c..6fa749104 100644
--- a/core/renderers/zelos/renderer.ts
+++ b/core/renderers/zelos/renderer.ts
@@ -12,10 +12,6 @@
 import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.Renderer');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../../theme.js';
-
 import type {BlockSvg} from '../../block_svg.js';
 import type {Connection} from '../../connection.js';
 import {ConnectionType} from '../../connection_type.js';
diff --git a/core/toolbox/toolbox.ts b/core/toolbox/toolbox.ts
index afb7de0a0..8368e9094 100644
--- a/core/toolbox/toolbox.ts
+++ b/core/toolbox/toolbox.ts
@@ -12,9 +12,6 @@
 import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Toolbox');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../shortcut_registry.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../events/events_toolbox_item_select.js';
 
diff --git a/core/trashcan.ts b/core/trashcan.ts
index 25b7724a4..8078432a4 100644
--- a/core/trashcan.ts
+++ b/core/trashcan.ts
@@ -12,9 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Trashcan');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './metrics_manager.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_trashcan_open.js';
 
diff --git a/core/utils/toolbox.ts b/core/utils/toolbox.ts
index 3eefb7364..622b0ad1a 100644
--- a/core/utils/toolbox.ts
+++ b/core/utils/toolbox.ts
@@ -12,13 +12,6 @@
 import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.toolbox');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../toolbox/category.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import '../toolbox/separator.js';
-
 import type {ConnectionState} from '../serialization/blocks.js';
 import type {CssConfig as CategoryCssConfig} from '../toolbox/category.js';
 import type {CssConfig as SeparatorCssConfig} from '../toolbox/separator.js';
diff --git a/core/workspace_comment.ts b/core/workspace_comment.ts
index 410f36945..449116f3d 100644
--- a/core/workspace_comment.ts
+++ b/core/workspace_comment.ts
@@ -12,13 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceComment');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './events/events_comment_change.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './events/events_comment_create.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './events/events_comment_delete.js';
-
 import type {CommentMove} from './events/events_comment_move.js';
 import * as eventUtils from './events/utils.js';
 import {Coordinate} from './utils/coordinate.js';
diff --git a/core/workspace_comment_svg.ts b/core/workspace_comment_svg.ts
index bfd298694..6efcc1143 100644
--- a/core/workspace_comment_svg.ts
+++ b/core/workspace_comment_svg.ts
@@ -12,10 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceCommentSvg');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './events/events_comment_create.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './events/events_comment_delete.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_selected.js';
 
diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts
index 663afe520..00310779e 100644
--- a/core/workspace_svg.ts
+++ b/core/workspace_svg.ts
@@ -12,31 +12,12 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceSvg');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './procedures.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './variables.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './variables_dynamic.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './rendered_connection.js';
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './zoom_controls.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_create.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_theme_change.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_viewport.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './metrics_manager.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './msg.js';
 
 import type {Block} from './block.js';
 import type {BlockDragSurfaceSvg} from './block_drag_surface.js';
diff --git a/core/xml.ts b/core/xml.ts
index 8e3a9c18d..ff81aac55 100644
--- a/core/xml.ts
+++ b/core/xml.ts
@@ -12,15 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Xml');
 
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './comment.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './variables.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './workspace_comment.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './workspace_comment_svg.js';
-
 import type {Block} from './block.js';
 import type {BlockSvg} from './block_svg.js';
 import type {Connection} from './connection.js';
diff --git a/core/zoom_controls.ts b/core/zoom_controls.ts
index 7a8df657a..5098487e2 100644
--- a/core/zoom_controls.ts
+++ b/core/zoom_controls.ts
@@ -12,9 +12,6 @@
 import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ZoomControls');
 
-/* eslint-disable-next-line no-unused-vars */
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './metrics_manager.js';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_click.js';