diff --git a/example/lib/example_state_machine.dart b/example/lib/example_state_machine.dart
index 9eb220c..15a2ec8 100644
--- a/example/lib/example_state_machine.dart
+++ b/example/lib/example_state_machine.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:rive/rive.dart';
 
 /// An example showing how to drive two boolean state machine inputs.
diff --git a/example/lib/liquid_download.dart b/example/lib/liquid_download.dart
index 3957677..3e2e3e9 100644
--- a/example/lib/liquid_download.dart
+++ b/example/lib/liquid_download.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:rive/rive.dart';
 
 /// An example showing how to drive a StateMachine via a trigger and number
diff --git a/example/lib/little_machine.dart b/example/lib/little_machine.dart
index 7653db0..3837436 100644
--- a/example/lib/little_machine.dart
+++ b/example/lib/little_machine.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:rive/rive.dart';
 
 /// An example showing how to drive a StateMachine via a trigger input.
diff --git a/example/lib/state_machine_skills.dart b/example/lib/state_machine_skills.dart
index 4b16f3f..5eda9ee 100644
--- a/example/lib/state_machine_skills.dart
+++ b/example/lib/state_machine_skills.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:rive/rive.dart';
 
 /// An example showing how to drive a StateMachine via one numeric input.
diff --git a/lib/src/controllers/one_shot_controller.dart b/lib/src/controllers/one_shot_controller.dart
index ddcaf79..b7a60a6 100644
--- a/lib/src/controllers/one_shot_controller.dart
+++ b/lib/src/controllers/one_shot_controller.dart
@@ -1,5 +1,3 @@
-import 'dart:ui' show VoidCallback;
-
 import 'package:flutter/widgets.dart';
 import 'package:rive/src/controllers/simple_controller.dart';
 
diff --git a/lib/src/controllers/state_machine_controller.dart b/lib/src/controllers/state_machine_controller.dart
index 4f63240..456a137 100644
--- a/lib/src/controllers/state_machine_controller.dart
+++ b/lib/src/controllers/state_machine_controller.dart
@@ -1,7 +1,4 @@
 import 'package:flutter/foundation.dart';
-import 'package:rive/src/generated/animation/state_machine_bool_base.dart';
-import 'package:rive/src/generated/animation/state_machine_number_base.dart';
-import 'package:rive/src/generated/animation/state_machine_trigger_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine.dart';
 import 'package:rive/src/rive_core/animation/state_machine_bool.dart';
 import 'package:rive/src/rive_core/animation/state_machine_input.dart' as core;
diff --git a/lib/src/core/importers/artboard_importer.dart b/lib/src/core/importers/artboard_importer.dart
index 79c847c..25d5de6 100644
--- a/lib/src/core/importers/artboard_importer.dart
+++ b/lib/src/core/importers/artboard_importer.dart
@@ -1,7 +1,6 @@
 import 'package:rive/rive.dart';
 import 'package:rive/src/core/core.dart';
 import 'package:rive/src/rive_core/animation/animation.dart';
-import 'package:rive/src/rive_core/animation/state_machine.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 class ArtboardImporter extends ImportStackObject {
diff --git a/lib/src/generated/animation/animation_state_base.dart b/lib/src/generated/animation/animation_state_base.dart
index f81bc42..b571096 100644
--- a/lib/src/generated/animation/animation_state_base.dart
+++ b/lib/src/generated/animation/animation_state_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/animation_state_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/layer_state_base.dart';
 import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/layer_state.dart';
 
diff --git a/lib/src/generated/animation/any_state_base.dart b/lib/src/generated/animation/any_state_base.dart
index 7c35b97..a4a8c6f 100644
--- a/lib/src/generated/animation/any_state_base.dart
+++ b/lib/src/generated/animation/any_state_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/any_state_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/layer_state_base.dart';
 import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/layer_state.dart';
 
diff --git a/lib/src/generated/animation/blend_animation_1d_base.dart b/lib/src/generated/animation/blend_animation_1d_base.dart
index 875e650..c4a7c7a 100644
--- a/lib/src/generated/animation/blend_animation_1d_base.dart
+++ b/lib/src/generated/animation/blend_animation_1d_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/blend_animation_1d_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/blend_animation_base.dart';
 import 'package:rive/src/rive_core/animation/blend_animation.dart';
 
 abstract class BlendAnimation1DBase extends BlendAnimation {
diff --git a/lib/src/generated/animation/blend_animation_direct_base.dart b/lib/src/generated/animation/blend_animation_direct_base.dart
index d722451..f81346f 100644
--- a/lib/src/generated/animation/blend_animation_direct_base.dart
+++ b/lib/src/generated/animation/blend_animation_direct_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/blend_animation_direct_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/blend_animation_base.dart';
 import 'package:rive/src/rive_core/animation/blend_animation.dart';
 
 abstract class BlendAnimationDirectBase extends BlendAnimation {
diff --git a/lib/src/generated/animation/blend_state_1d_base.dart b/lib/src/generated/animation/blend_state_1d_base.dart
index 7cf9fc1..0efd643 100644
--- a/lib/src/generated/animation/blend_state_1d_base.dart
+++ b/lib/src/generated/animation/blend_state_1d_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/blend_state_1d_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/blend_state_base.dart';
 import 'package:rive/src/generated/animation/layer_state_base.dart';
 import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/blend_animation_1d.dart';
diff --git a/lib/src/generated/animation/blend_state_base.dart b/lib/src/generated/animation/blend_state_base.dart
index 1f97b13..73cf6ff 100644
--- a/lib/src/generated/animation/blend_state_base.dart
+++ b/lib/src/generated/animation/blend_state_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/blend_state_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/layer_state_base.dart';
 import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/layer_state.dart';
 
diff --git a/lib/src/generated/animation/blend_state_direct_base.dart b/lib/src/generated/animation/blend_state_direct_base.dart
index 684af45..9366be0 100644
--- a/lib/src/generated/animation/blend_state_direct_base.dart
+++ b/lib/src/generated/animation/blend_state_direct_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/blend_state_direct_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/blend_state_base.dart';
 import 'package:rive/src/generated/animation/layer_state_base.dart';
 import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/blend_animation_direct.dart';
diff --git a/lib/src/generated/animation/blend_state_transition_base.dart b/lib/src/generated/animation/blend_state_transition_base.dart
index 7330f48..3b8a726 100644
--- a/lib/src/generated/animation/blend_state_transition_base.dart
+++ b/lib/src/generated/animation/blend_state_transition_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
-import 'package:rive/src/generated/animation/state_transition_base.dart';
 import 'package:rive/src/rive_core/animation/state_transition.dart';
 
 abstract class BlendStateTransitionBase extends StateTransition {
diff --git a/lib/src/generated/animation/entry_state_base.dart b/lib/src/generated/animation/entry_state_base.dart
index f2b1bd2..8f26acf 100644
--- a/lib/src/generated/animation/entry_state_base.dart
+++ b/lib/src/generated/animation/entry_state_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/entry_state_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/layer_state_base.dart';
 import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/layer_state.dart';
 
diff --git a/lib/src/generated/animation/exit_state_base.dart b/lib/src/generated/animation/exit_state_base.dart
index 939ae6f..157a2d0 100644
--- a/lib/src/generated/animation/exit_state_base.dart
+++ b/lib/src/generated/animation/exit_state_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/exit_state_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/layer_state_base.dart';
 import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/layer_state.dart';
 
diff --git a/lib/src/generated/animation/keyframe_bool_base.dart b/lib/src/generated/animation/keyframe_bool_base.dart
index 58431ce..c745ea3 100644
--- a/lib/src/generated/animation/keyframe_bool_base.dart
+++ b/lib/src/generated/animation/keyframe_bool_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/keyframe_bool_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/keyframe_base.dart';
 import 'package:rive/src/rive_core/animation/keyframe.dart';
 
 abstract class KeyFrameBoolBase extends KeyFrame {
diff --git a/lib/src/generated/animation/keyframe_color_base.dart b/lib/src/generated/animation/keyframe_color_base.dart
index 66949ed..fc14359 100644
--- a/lib/src/generated/animation/keyframe_color_base.dart
+++ b/lib/src/generated/animation/keyframe_color_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/keyframe_color_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/keyframe_base.dart';
 import 'package:rive/src/rive_core/animation/keyframe.dart';
 
 abstract class KeyFrameColorBase extends KeyFrame {
diff --git a/lib/src/generated/animation/keyframe_double_base.dart b/lib/src/generated/animation/keyframe_double_base.dart
index a45c0dd..cb53cc6 100644
--- a/lib/src/generated/animation/keyframe_double_base.dart
+++ b/lib/src/generated/animation/keyframe_double_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/keyframe_double_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/keyframe_base.dart';
 import 'package:rive/src/rive_core/animation/keyframe.dart';
 
 abstract class KeyFrameDoubleBase extends KeyFrame {
diff --git a/lib/src/generated/animation/keyframe_id_base.dart b/lib/src/generated/animation/keyframe_id_base.dart
index 9157fa3..34ca9d0 100644
--- a/lib/src/generated/animation/keyframe_id_base.dart
+++ b/lib/src/generated/animation/keyframe_id_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/keyframe_id_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/keyframe_base.dart';
 import 'package:rive/src/rive_core/animation/keyframe.dart';
 
 abstract class KeyFrameIdBase extends KeyFrame {
diff --git a/lib/src/generated/animation/keyframe_play_base.dart b/lib/src/generated/animation/keyframe_play_base.dart
index 56c02c6..e365727 100644
--- a/lib/src/generated/animation/keyframe_play_base.dart
+++ b/lib/src/generated/animation/keyframe_play_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/keyframe_play_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/keyframe_base.dart';
 import 'package:rive/src/rive_core/animation/keyframe.dart';
 
 abstract class KeyFramePlayBase extends KeyFrame {
diff --git a/lib/src/generated/animation/layer_state_base.dart b/lib/src/generated/animation/layer_state_base.dart
index a5e1415..43e9abf 100644
--- a/lib/src/generated/animation/layer_state_base.dart
+++ b/lib/src/generated/animation/layer_state_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/layer_state_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine_layer_component.dart';
 
 abstract class LayerStateBase extends StateMachineLayerComponent {
diff --git a/lib/src/generated/animation/linear_animation_base.dart b/lib/src/generated/animation/linear_animation_base.dart
index 2e50da3..9b5a021 100644
--- a/lib/src/generated/animation/linear_animation_base.dart
+++ b/lib/src/generated/animation/linear_animation_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/linear_animation_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/animation_base.dart';
 import 'package:rive/src/rive_core/animation/animation.dart';
 
 abstract class LinearAnimationBase extends Animation {
diff --git a/lib/src/generated/animation/nested_linear_animation_base.dart b/lib/src/generated/animation/nested_linear_animation_base.dart
index 7cc3bd6..3bf7247 100644
--- a/lib/src/generated/animation/nested_linear_animation_base.dart
+++ b/lib/src/generated/animation/nested_linear_animation_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/component_base.dart';
-import 'package:rive/src/generated/nested_animation_base.dart';
 import 'package:rive/src/rive_core/animation/linear_animation.dart';
 import 'package:rive/src/rive_core/nested_animation.dart';
 
diff --git a/lib/src/generated/animation/nested_remap_animation_base.dart b/lib/src/generated/animation/nested_remap_animation_base.dart
index 00a4a5b..841a0b7 100644
--- a/lib/src/generated/animation/nested_remap_animation_base.dart
+++ b/lib/src/generated/animation/nested_remap_animation_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/nested_remap_animation_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/nested_linear_animation_base.dart';
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/nested_animation_base.dart';
 import 'package:rive/src/rive_core/animation/nested_linear_animation.dart';
diff --git a/lib/src/generated/animation/nested_simple_animation_base.dart b/lib/src/generated/animation/nested_simple_animation_base.dart
index 92bd5a8..8788067 100644
--- a/lib/src/generated/animation/nested_simple_animation_base.dart
+++ b/lib/src/generated/animation/nested_simple_animation_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/nested_simple_animation_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/nested_linear_animation_base.dart';
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/nested_animation_base.dart';
 import 'package:rive/src/rive_core/animation/nested_linear_animation.dart';
diff --git a/lib/src/generated/animation/nested_state_machine_base.dart b/lib/src/generated/animation/nested_state_machine_base.dart
index c76b305..a9da9ee 100644
--- a/lib/src/generated/animation/nested_state_machine_base.dart
+++ b/lib/src/generated/animation/nested_state_machine_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/component_base.dart';
-import 'package:rive/src/generated/nested_animation_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine.dart';
 import 'package:rive/src/rive_core/nested_animation.dart';
 
diff --git a/lib/src/generated/animation/state_machine_base.dart b/lib/src/generated/animation/state_machine_base.dart
index 5cde80f..875e9e4 100644
--- a/lib/src/generated/animation/state_machine_base.dart
+++ b/lib/src/generated/animation/state_machine_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/state_machine_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/animation_base.dart';
 import 'package:rive/src/rive_core/animation/animation.dart';
 
 abstract class StateMachineBase extends Animation {
diff --git a/lib/src/generated/animation/state_machine_bool_base.dart b/lib/src/generated/animation/state_machine_bool_base.dart
index ff57bfa..8b80be6 100644
--- a/lib/src/generated/animation/state_machine_bool_base.dart
+++ b/lib/src/generated/animation/state_machine_bool_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/animation/state_machine_component_base.dart';
-import 'package:rive/src/generated/animation/state_machine_input_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine_input.dart';
 
 abstract class StateMachineBoolBase extends StateMachineInput {
diff --git a/lib/src/generated/animation/state_machine_double_base.dart b/lib/src/generated/animation/state_machine_double_base.dart
index 5aac4ba..436168e 100644
--- a/lib/src/generated/animation/state_machine_double_base.dart
+++ b/lib/src/generated/animation/state_machine_double_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/animation/state_machine_component_base.dart';
-import 'package:rive/src/generated/animation/state_machine_input_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine_input.dart';
 
 abstract class StateMachineDoubleBase extends StateMachineInput {
diff --git a/lib/src/generated/animation/state_machine_input_base.dart b/lib/src/generated/animation/state_machine_input_base.dart
index 31603a4..7d03997 100644
--- a/lib/src/generated/animation/state_machine_input_base.dart
+++ b/lib/src/generated/animation/state_machine_input_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/state_machine_input_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/state_machine_component_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine_component.dart';
 
 abstract class StateMachineInputBase extends StateMachineComponent {
diff --git a/lib/src/generated/animation/state_machine_layer_base.dart b/lib/src/generated/animation/state_machine_layer_base.dart
index 0e79048..3727ecc 100644
--- a/lib/src/generated/animation/state_machine_layer_base.dart
+++ b/lib/src/generated/animation/state_machine_layer_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/state_machine_layer_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/state_machine_component_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine_component.dart';
 
 abstract class StateMachineLayerBase extends StateMachineComponent {
diff --git a/lib/src/generated/animation/state_machine_number_base.dart b/lib/src/generated/animation/state_machine_number_base.dart
index b59584c..f5c9f79 100644
--- a/lib/src/generated/animation/state_machine_number_base.dart
+++ b/lib/src/generated/animation/state_machine_number_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/animation/state_machine_component_base.dart';
-import 'package:rive/src/generated/animation/state_machine_input_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine_input.dart';
 
 abstract class StateMachineNumberBase extends StateMachineInput {
diff --git a/lib/src/generated/animation/state_machine_trigger_base.dart b/lib/src/generated/animation/state_machine_trigger_base.dart
index 7e39d74..715ed01 100644
--- a/lib/src/generated/animation/state_machine_trigger_base.dart
+++ b/lib/src/generated/animation/state_machine_trigger_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/animation/state_machine_component_base.dart';
-import 'package:rive/src/generated/animation/state_machine_input_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine_input.dart';
 
 abstract class StateMachineTriggerBase extends StateMachineInput {
diff --git a/lib/src/generated/animation/state_transition_base.dart b/lib/src/generated/animation/state_transition_base.dart
index 41f474b..c5eaff6 100644
--- a/lib/src/generated/animation/state_transition_base.dart
+++ b/lib/src/generated/animation/state_transition_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/state_transition_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/state_machine_layer_component_base.dart';
 import 'package:rive/src/rive_core/animation/state_machine_layer_component.dart';
 
 abstract class StateTransitionBase extends StateMachineLayerComponent {
diff --git a/lib/src/generated/animation/transition_bool_condition_base.dart b/lib/src/generated/animation/transition_bool_condition_base.dart
index aef7e4f..a278cb5 100644
--- a/lib/src/generated/animation/transition_bool_condition_base.dart
+++ b/lib/src/generated/animation/transition_bool_condition_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/animation/transition_condition_base.dart';
-import 'package:rive/src/generated/animation/transition_value_condition_base.dart';
 import 'package:rive/src/rive_core/animation/transition_value_condition.dart';
 
 abstract class TransitionBoolConditionBase extends TransitionValueCondition {
diff --git a/lib/src/generated/animation/transition_double_condition_base.dart b/lib/src/generated/animation/transition_double_condition_base.dart
index 3aa9ef3..6a483f2 100644
--- a/lib/src/generated/animation/transition_double_condition_base.dart
+++ b/lib/src/generated/animation/transition_double_condition_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/animation/transition_condition_base.dart';
-import 'package:rive/src/generated/animation/transition_value_condition_base.dart';
 import 'package:rive/src/rive_core/animation/transition_value_condition.dart';
 
 abstract class TransitionDoubleConditionBase extends TransitionValueCondition {
diff --git a/lib/src/generated/animation/transition_number_condition_base.dart b/lib/src/generated/animation/transition_number_condition_base.dart
index 6b4b570..c23884d 100644
--- a/lib/src/generated/animation/transition_number_condition_base.dart
+++ b/lib/src/generated/animation/transition_number_condition_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/animation/transition_condition_base.dart';
-import 'package:rive/src/generated/animation/transition_value_condition_base.dart';
 import 'package:rive/src/rive_core/animation/transition_value_condition.dart';
 
 abstract class TransitionNumberConditionBase extends TransitionValueCondition {
diff --git a/lib/src/generated/animation/transition_trigger_condition_base.dart b/lib/src/generated/animation/transition_trigger_condition_base.dart
index e7bd330..fbc9012 100644
--- a/lib/src/generated/animation/transition_trigger_condition_base.dart
+++ b/lib/src/generated/animation/transition_trigger_condition_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/transition_trigger_condition_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/transition_condition_base.dart';
 import 'package:rive/src/rive_core/animation/transition_condition.dart';
 
 abstract class TransitionTriggerConditionBase extends TransitionCondition {
diff --git a/lib/src/generated/animation/transition_value_condition_base.dart b/lib/src/generated/animation/transition_value_condition_base.dart
index 46021ed..f42da8e 100644
--- a/lib/src/generated/animation/transition_value_condition_base.dart
+++ b/lib/src/generated/animation/transition_value_condition_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/animation/transition_value_condition_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/animation/transition_condition_base.dart';
 import 'package:rive/src/rive_core/animation/transition_condition.dart';
 
 abstract class TransitionValueConditionBase extends TransitionCondition {
diff --git a/lib/src/generated/artboard_base.dart b/lib/src/generated/artboard_base.dart
index 859469b..5987e0f 100644
--- a/lib/src/generated/artboard_base.dart
+++ b/lib/src/generated/artboard_base.dart
@@ -3,7 +3,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/world_transform_component.dart';
 
 abstract class ArtboardBase extends WorldTransformComponent {
diff --git a/lib/src/generated/assets/drawable_asset_base.dart b/lib/src/generated/assets/drawable_asset_base.dart
index 7519637..40d8389 100644
--- a/lib/src/generated/assets/drawable_asset_base.dart
+++ b/lib/src/generated/assets/drawable_asset_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/assets/asset_base.dart';
-import 'package:rive/src/generated/assets/file_asset_base.dart';
 import 'package:rive/src/rive_core/assets/file_asset.dart';
 
 abstract class DrawableAssetBase extends FileAsset {
diff --git a/lib/src/generated/assets/file_asset_base.dart b/lib/src/generated/assets/file_asset_base.dart
index acb808d..c10a767 100644
--- a/lib/src/generated/assets/file_asset_base.dart
+++ b/lib/src/generated/assets/file_asset_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/assets/file_asset_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/assets/asset_base.dart';
 import 'package:rive/src/rive_core/assets/asset.dart';
 
 abstract class FileAssetBase extends Asset {
diff --git a/lib/src/generated/assets/folder_base.dart b/lib/src/generated/assets/folder_base.dart
index 4450dfc..83fff39 100644
--- a/lib/src/generated/assets/folder_base.dart
+++ b/lib/src/generated/assets/folder_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/assets/folder_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/assets/asset_base.dart';
 import 'package:rive/src/rive_core/assets/asset.dart';
 
 abstract class FolderBase extends Asset {
diff --git a/lib/src/generated/assets/image_asset_base.dart b/lib/src/generated/assets/image_asset_base.dart
index 1fd36d8..fd40570 100644
--- a/lib/src/generated/assets/image_asset_base.dart
+++ b/lib/src/generated/assets/image_asset_base.dart
@@ -2,7 +2,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/assets/asset_base.dart';
-import 'package:rive/src/generated/assets/drawable_asset_base.dart';
 import 'package:rive/src/generated/assets/file_asset_base.dart';
 import 'package:rive/src/rive_core/assets/drawable_asset.dart';
 
diff --git a/lib/src/generated/bones/bone_base.dart b/lib/src/generated/bones/bone_base.dart
index 882c0b8..8c38d17 100644
--- a/lib/src/generated/bones/bone_base.dart
+++ b/lib/src/generated/bones/bone_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/bones/bone_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/bones/skeletal_component_base.dart';
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
diff --git a/lib/src/generated/bones/cubic_weight_base.dart b/lib/src/generated/bones/cubic_weight_base.dart
index 281e964..6226b9f 100644
--- a/lib/src/generated/bones/cubic_weight_base.dart
+++ b/lib/src/generated/bones/cubic_weight_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/bones/cubic_weight_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/bones/weight_base.dart';
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/bones/weight.dart';
 
diff --git a/lib/src/generated/bones/root_bone_base.dart b/lib/src/generated/bones/root_bone_base.dart
index 6e30079..ef19210 100644
--- a/lib/src/generated/bones/root_bone_base.dart
+++ b/lib/src/generated/bones/root_bone_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/bones/root_bone_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/bones/bone_base.dart';
 import 'package:rive/src/generated/bones/skeletal_component_base.dart';
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
diff --git a/lib/src/generated/bones/skeletal_component_base.dart b/lib/src/generated/bones/skeletal_component_base.dart
index 33ee4e0..053772f 100644
--- a/lib/src/generated/bones/skeletal_component_base.dart
+++ b/lib/src/generated/bones/skeletal_component_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/transform_component.dart';
 
diff --git a/lib/src/generated/bones/tendon_base.dart b/lib/src/generated/bones/tendon_base.dart
index ec54578..b4c9fa7 100644
--- a/lib/src/generated/bones/tendon_base.dart
+++ b/lib/src/generated/bones/tendon_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/bones/tendon_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class TendonBase extends Component {
diff --git a/lib/src/generated/bones/weight_base.dart b/lib/src/generated/bones/weight_base.dart
index 4e04af6..5062df4 100644
--- a/lib/src/generated/bones/weight_base.dart
+++ b/lib/src/generated/bones/weight_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/bones/weight_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class WeightBase extends Component {
diff --git a/lib/src/generated/constraints/constraint_base.dart b/lib/src/generated/constraints/constraint_base.dart
index e6fe4ea..3f9f250 100644
--- a/lib/src/generated/constraints/constraint_base.dart
+++ b/lib/src/generated/constraints/constraint_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/constraints/constraint_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class ConstraintBase extends Component {
diff --git a/lib/src/generated/constraints/distance_constraint_base.dart b/lib/src/generated/constraints/distance_constraint_base.dart
index 32ca075..9006f1f 100644
--- a/lib/src/generated/constraints/distance_constraint_base.dart
+++ b/lib/src/generated/constraints/distance_constraint_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
-import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/targeted_constraint.dart';
 
 abstract class DistanceConstraintBase extends TargetedConstraint {
diff --git a/lib/src/generated/constraints/ik_constraint_base.dart b/lib/src/generated/constraints/ik_constraint_base.dart
index 9e74cae..37917ef 100644
--- a/lib/src/generated/constraints/ik_constraint_base.dart
+++ b/lib/src/generated/constraints/ik_constraint_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
-import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/targeted_constraint.dart';
 
 abstract class IKConstraintBase extends TargetedConstraint {
diff --git a/lib/src/generated/constraints/rotation_constraint_base.dart b/lib/src/generated/constraints/rotation_constraint_base.dart
index 07d4384..8ac9bea 100644
--- a/lib/src/generated/constraints/rotation_constraint_base.dart
+++ b/lib/src/generated/constraints/rotation_constraint_base.dart
@@ -5,7 +5,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
 import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
-import 'package:rive/src/generated/constraints/transform_component_constraint_base.dart';
 import 'package:rive/src/generated/constraints/transform_space_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/transform_component_constraint.dart';
 
diff --git a/lib/src/generated/constraints/scale_constraint_base.dart b/lib/src/generated/constraints/scale_constraint_base.dart
index 04cf23d..8a0b6ce 100644
--- a/lib/src/generated/constraints/scale_constraint_base.dart
+++ b/lib/src/generated/constraints/scale_constraint_base.dart
@@ -6,7 +6,6 @@ import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
 import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
 import 'package:rive/src/generated/constraints/transform_component_constraint_base.dart';
-import 'package:rive/src/generated/constraints/transform_component_constraint_y_base.dart';
 import 'package:rive/src/generated/constraints/transform_space_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/transform_component_constraint_y.dart';
 
diff --git a/lib/src/generated/constraints/targeted_constraint_base.dart b/lib/src/generated/constraints/targeted_constraint_base.dart
index 7b74302..cc739a6 100644
--- a/lib/src/generated/constraints/targeted_constraint_base.dart
+++ b/lib/src/generated/constraints/targeted_constraint_base.dart
@@ -3,7 +3,6 @@
 /// Do not modify manually.
 
 import 'package:rive/src/generated/component_base.dart';
-import 'package:rive/src/generated/constraints/constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/constraint.dart';
 
 abstract class TargetedConstraintBase extends Constraint {
diff --git a/lib/src/generated/constraints/transform_component_constraint_base.dart b/lib/src/generated/constraints/transform_component_constraint_base.dart
index a4fdf27..b96e200 100644
--- a/lib/src/generated/constraints/transform_component_constraint_base.dart
+++ b/lib/src/generated/constraints/transform_component_constraint_base.dart
@@ -5,7 +5,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
 import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
-import 'package:rive/src/generated/constraints/transform_space_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/transform_space_constraint.dart';
 
 abstract class TransformComponentConstraintBase
diff --git a/lib/src/generated/constraints/transform_component_constraint_y_base.dart b/lib/src/generated/constraints/transform_component_constraint_y_base.dart
index 72629b8..890b7c5 100644
--- a/lib/src/generated/constraints/transform_component_constraint_y_base.dart
+++ b/lib/src/generated/constraints/transform_component_constraint_y_base.dart
@@ -5,7 +5,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
 import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
-import 'package:rive/src/generated/constraints/transform_component_constraint_base.dart';
 import 'package:rive/src/generated/constraints/transform_space_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/transform_component_constraint.dart';
 
diff --git a/lib/src/generated/constraints/transform_constraint_base.dart b/lib/src/generated/constraints/transform_constraint_base.dart
index c7ff9d4..d4fbef9 100644
--- a/lib/src/generated/constraints/transform_constraint_base.dart
+++ b/lib/src/generated/constraints/transform_constraint_base.dart
@@ -5,7 +5,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
 import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
-import 'package:rive/src/generated/constraints/transform_space_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/transform_space_constraint.dart';
 
 abstract class TransformConstraintBase extends TransformSpaceConstraint {
diff --git a/lib/src/generated/constraints/transform_space_constraint_base.dart b/lib/src/generated/constraints/transform_space_constraint_base.dart
index 32667e1..8a2593f 100644
--- a/lib/src/generated/constraints/transform_space_constraint_base.dart
+++ b/lib/src/generated/constraints/transform_space_constraint_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
-import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/targeted_constraint.dart';
 
 abstract class TransformSpaceConstraintBase extends TargetedConstraint {
diff --git a/lib/src/generated/constraints/translation_constraint_base.dart b/lib/src/generated/constraints/translation_constraint_base.dart
index ecd7cf5..f698e65 100644
--- a/lib/src/generated/constraints/translation_constraint_base.dart
+++ b/lib/src/generated/constraints/translation_constraint_base.dart
@@ -6,7 +6,6 @@ import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
 import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
 import 'package:rive/src/generated/constraints/transform_component_constraint_base.dart';
-import 'package:rive/src/generated/constraints/transform_component_constraint_y_base.dart';
 import 'package:rive/src/generated/constraints/transform_space_constraint_base.dart';
 import 'package:rive/src/rive_core/constraints/transform_component_constraint_y.dart';
 
diff --git a/lib/src/generated/container_component_base.dart b/lib/src/generated/container_component_base.dart
index ce108d9..8148428 100644
--- a/lib/src/generated/container_component_base.dart
+++ b/lib/src/generated/container_component_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/container_component_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class ContainerComponentBase extends Component {
diff --git a/lib/src/generated/draw_target_base.dart b/lib/src/generated/draw_target_base.dart
index bf089d6..2f41150 100644
--- a/lib/src/generated/draw_target_base.dart
+++ b/lib/src/generated/draw_target_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/draw_target_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class DrawTargetBase extends Component {
diff --git a/lib/src/generated/drawable_base.dart b/lib/src/generated/drawable_base.dart
index 9329182..9b07314 100644
--- a/lib/src/generated/drawable_base.dart
+++ b/lib/src/generated/drawable_base.dart
@@ -3,7 +3,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/node_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/node.dart';
diff --git a/lib/src/generated/nested_animation_base.dart b/lib/src/generated/nested_animation_base.dart
index 65eed28..63bcb4e 100644
--- a/lib/src/generated/nested_animation_base.dart
+++ b/lib/src/generated/nested_animation_base.dart
@@ -1,7 +1,6 @@
 /// Core automatically generated lib/src/generated/nested_animation_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class NestedAnimationBase extends Component {
diff --git a/lib/src/generated/nested_artboard_base.dart b/lib/src/generated/nested_artboard_base.dart
index 2a7e2de..c29b537 100644
--- a/lib/src/generated/nested_artboard_base.dart
+++ b/lib/src/generated/nested_artboard_base.dart
@@ -3,7 +3,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/drawable_base.dart';
 import 'package:rive/src/generated/node_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
diff --git a/lib/src/generated/node_base.dart b/lib/src/generated/node_base.dart
index 99af623..aae987d 100644
--- a/lib/src/generated/node_base.dart
+++ b/lib/src/generated/node_base.dart
@@ -3,7 +3,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/transform_component.dart';
 
diff --git a/lib/src/generated/rive_core_context.dart b/lib/src/generated/rive_core_context.dart
index 7a9483c..674c24d 100644
--- a/lib/src/generated/rive_core_context.dart
+++ b/lib/src/generated/rive_core_context.dart
@@ -6,98 +6,28 @@ import 'package:rive/src/core/field_types/core_double_type.dart';
 import 'package:rive/src/core/field_types/core_field_type.dart';
 import 'package:rive/src/core/field_types/core_string_type.dart';
 import 'package:rive/src/core/field_types/core_uint_type.dart';
-import 'package:rive/src/generated/animation/animation_base.dart';
-import 'package:rive/src/generated/animation/animation_state_base.dart';
-import 'package:rive/src/generated/animation/any_state_base.dart';
-import 'package:rive/src/generated/animation/blend_animation_1d_base.dart';
 import 'package:rive/src/generated/animation/blend_animation_base.dart';
-import 'package:rive/src/generated/animation/blend_animation_direct_base.dart';
-import 'package:rive/src/generated/animation/blend_state_1d_base.dart';
-import 'package:rive/src/generated/animation/blend_state_direct_base.dart';
-import 'package:rive/src/generated/animation/blend_state_transition_base.dart';
 import 'package:rive/src/generated/animation/cubic_interpolator_base.dart';
-import 'package:rive/src/generated/animation/entry_state_base.dart';
-import 'package:rive/src/generated/animation/exit_state_base.dart';
-import 'package:rive/src/generated/animation/keyed_object_base.dart';
-import 'package:rive/src/generated/animation/keyed_property_base.dart';
 import 'package:rive/src/generated/animation/keyframe_base.dart';
-import 'package:rive/src/generated/animation/keyframe_bool_base.dart';
-import 'package:rive/src/generated/animation/keyframe_color_base.dart';
-import 'package:rive/src/generated/animation/keyframe_double_base.dart';
-import 'package:rive/src/generated/animation/keyframe_id_base.dart';
-import 'package:rive/src/generated/animation/linear_animation_base.dart';
 import 'package:rive/src/generated/animation/nested_linear_animation_base.dart';
-import 'package:rive/src/generated/animation/nested_remap_animation_base.dart';
-import 'package:rive/src/generated/animation/nested_simple_animation_base.dart';
-import 'package:rive/src/generated/animation/nested_state_machine_base.dart';
-import 'package:rive/src/generated/animation/state_machine_base.dart';
-import 'package:rive/src/generated/animation/state_machine_bool_base.dart';
 import 'package:rive/src/generated/animation/state_machine_component_base.dart';
-import 'package:rive/src/generated/animation/state_machine_layer_base.dart';
-import 'package:rive/src/generated/animation/state_machine_number_base.dart';
-import 'package:rive/src/generated/animation/state_machine_trigger_base.dart';
-import 'package:rive/src/generated/animation/state_transition_base.dart';
-import 'package:rive/src/generated/animation/transition_bool_condition_base.dart';
 import 'package:rive/src/generated/animation/transition_condition_base.dart';
-import 'package:rive/src/generated/animation/transition_number_condition_base.dart';
-import 'package:rive/src/generated/animation/transition_trigger_condition_base.dart';
 import 'package:rive/src/generated/animation/transition_value_condition_base.dart';
-import 'package:rive/src/generated/artboard_base.dart';
 import 'package:rive/src/generated/assets/asset_base.dart';
 import 'package:rive/src/generated/assets/drawable_asset_base.dart';
 import 'package:rive/src/generated/assets/file_asset_base.dart';
-import 'package:rive/src/generated/assets/file_asset_contents_base.dart';
-import 'package:rive/src/generated/assets/folder_base.dart';
-import 'package:rive/src/generated/assets/image_asset_base.dart';
-import 'package:rive/src/generated/backboard_base.dart';
-import 'package:rive/src/generated/bones/bone_base.dart';
-import 'package:rive/src/generated/bones/cubic_weight_base.dart';
-import 'package:rive/src/generated/bones/root_bone_base.dart';
-import 'package:rive/src/generated/bones/skin_base.dart';
-import 'package:rive/src/generated/bones/tendon_base.dart';
-import 'package:rive/src/generated/bones/weight_base.dart';
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/constraints/constraint_base.dart';
-import 'package:rive/src/generated/constraints/distance_constraint_base.dart';
-import 'package:rive/src/generated/constraints/ik_constraint_base.dart';
-import 'package:rive/src/generated/constraints/rotation_constraint_base.dart';
-import 'package:rive/src/generated/constraints/scale_constraint_base.dart';
 import 'package:rive/src/generated/constraints/targeted_constraint_base.dart';
 import 'package:rive/src/generated/constraints/transform_component_constraint_base.dart';
 import 'package:rive/src/generated/constraints/transform_component_constraint_y_base.dart';
-import 'package:rive/src/generated/constraints/transform_constraint_base.dart';
 import 'package:rive/src/generated/constraints/transform_space_constraint_base.dart';
-import 'package:rive/src/generated/constraints/translation_constraint_base.dart';
-import 'package:rive/src/generated/draw_rules_base.dart';
-import 'package:rive/src/generated/draw_target_base.dart';
 import 'package:rive/src/generated/drawable_base.dart';
 import 'package:rive/src/generated/nested_animation_base.dart';
-import 'package:rive/src/generated/nested_artboard_base.dart';
-import 'package:rive/src/generated/node_base.dart';
-import 'package:rive/src/generated/shapes/clipping_shape_base.dart';
-import 'package:rive/src/generated/shapes/cubic_asymmetric_vertex_base.dart';
-import 'package:rive/src/generated/shapes/cubic_detached_vertex_base.dart';
-import 'package:rive/src/generated/shapes/cubic_mirrored_vertex_base.dart';
-import 'package:rive/src/generated/shapes/ellipse_base.dart';
-import 'package:rive/src/generated/shapes/image_base.dart';
-import 'package:rive/src/generated/shapes/paint/fill_base.dart';
-import 'package:rive/src/generated/shapes/paint/gradient_stop_base.dart';
-import 'package:rive/src/generated/shapes/paint/linear_gradient_base.dart';
-import 'package:rive/src/generated/shapes/paint/radial_gradient_base.dart';
 import 'package:rive/src/generated/shapes/paint/shape_paint_base.dart';
-import 'package:rive/src/generated/shapes/paint/solid_color_base.dart';
-import 'package:rive/src/generated/shapes/paint/stroke_base.dart';
-import 'package:rive/src/generated/shapes/paint/trim_path_base.dart';
 import 'package:rive/src/generated/shapes/parametric_path_base.dart';
 import 'package:rive/src/generated/shapes/path_base.dart';
 import 'package:rive/src/generated/shapes/path_vertex_base.dart';
-import 'package:rive/src/generated/shapes/points_path_base.dart';
-import 'package:rive/src/generated/shapes/polygon_base.dart';
-import 'package:rive/src/generated/shapes/rectangle_base.dart';
-import 'package:rive/src/generated/shapes/shape_base.dart';
-import 'package:rive/src/generated/shapes/star_base.dart';
-import 'package:rive/src/generated/shapes/straight_vertex_base.dart';
-import 'package:rive/src/generated/shapes/triangle_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/animation/animation.dart';
diff --git a/lib/src/generated/shapes/clipping_shape_base.dart b/lib/src/generated/shapes/clipping_shape_base.dart
index c8d291f..d920c19 100644
--- a/lib/src/generated/shapes/clipping_shape_base.dart
+++ b/lib/src/generated/shapes/clipping_shape_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/shapes/clipping_shape_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class ClippingShapeBase extends Component {
diff --git a/lib/src/generated/shapes/cubic_asymmetric_vertex_base.dart b/lib/src/generated/shapes/cubic_asymmetric_vertex_base.dart
index 4e80dfa..b04164d 100644
--- a/lib/src/generated/shapes/cubic_asymmetric_vertex_base.dart
+++ b/lib/src/generated/shapes/cubic_asymmetric_vertex_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/shapes/cubic_vertex_base.dart';
 import 'package:rive/src/generated/shapes/path_vertex_base.dart';
 import 'package:rive/src/rive_core/shapes/cubic_vertex.dart';
 
diff --git a/lib/src/generated/shapes/cubic_detached_vertex_base.dart b/lib/src/generated/shapes/cubic_detached_vertex_base.dart
index 2df9d2a..9bc3a58 100644
--- a/lib/src/generated/shapes/cubic_detached_vertex_base.dart
+++ b/lib/src/generated/shapes/cubic_detached_vertex_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/shapes/cubic_vertex_base.dart';
 import 'package:rive/src/generated/shapes/path_vertex_base.dart';
 import 'package:rive/src/rive_core/shapes/cubic_vertex.dart';
 
diff --git a/lib/src/generated/shapes/cubic_mirrored_vertex_base.dart b/lib/src/generated/shapes/cubic_mirrored_vertex_base.dart
index f84ead0..1f0b34c 100644
--- a/lib/src/generated/shapes/cubic_mirrored_vertex_base.dart
+++ b/lib/src/generated/shapes/cubic_mirrored_vertex_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/shapes/cubic_vertex_base.dart';
 import 'package:rive/src/generated/shapes/path_vertex_base.dart';
 import 'package:rive/src/rive_core/shapes/cubic_vertex.dart';
 
diff --git a/lib/src/generated/shapes/cubic_vertex_base.dart b/lib/src/generated/shapes/cubic_vertex_base.dart
index b2f0339..d88a74a 100644
--- a/lib/src/generated/shapes/cubic_vertex_base.dart
+++ b/lib/src/generated/shapes/cubic_vertex_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/shapes/path_vertex_base.dart';
 import 'package:rive/src/rive_core/bones/cubic_weight.dart';
 import 'package:rive/src/rive_core/shapes/path_vertex.dart';
 
diff --git a/lib/src/generated/shapes/ellipse_base.dart b/lib/src/generated/shapes/ellipse_base.dart
index d29f2cb..48e4be2 100644
--- a/lib/src/generated/shapes/ellipse_base.dart
+++ b/lib/src/generated/shapes/ellipse_base.dart
@@ -4,7 +4,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
 import 'package:rive/src/generated/node_base.dart';
-import 'package:rive/src/generated/shapes/parametric_path_base.dart';
 import 'package:rive/src/generated/shapes/path_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
diff --git a/lib/src/generated/shapes/image_base.dart b/lib/src/generated/shapes/image_base.dart
index ca15160..8ffbfd2 100644
--- a/lib/src/generated/shapes/image_base.dart
+++ b/lib/src/generated/shapes/image_base.dart
@@ -3,7 +3,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/drawable_base.dart';
 import 'package:rive/src/generated/node_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
diff --git a/lib/src/generated/shapes/paint/fill_base.dart b/lib/src/generated/shapes/paint/fill_base.dart
index 4756d54..29c98e1 100644
--- a/lib/src/generated/shapes/paint/fill_base.dart
+++ b/lib/src/generated/shapes/paint/fill_base.dart
@@ -3,7 +3,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/shapes/paint/shape_paint_base.dart';
 import 'package:rive/src/rive_core/shapes/paint/shape_paint.dart';
 
 abstract class FillBase extends ShapePaint {
diff --git a/lib/src/generated/shapes/paint/gradient_stop_base.dart b/lib/src/generated/shapes/paint/gradient_stop_base.dart
index 7ebfcbb..87d72e6 100644
--- a/lib/src/generated/shapes/paint/gradient_stop_base.dart
+++ b/lib/src/generated/shapes/paint/gradient_stop_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/shapes/paint/gradient_stop_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class GradientStopBase extends Component {
diff --git a/lib/src/generated/shapes/paint/radial_gradient_base.dart b/lib/src/generated/shapes/paint/radial_gradient_base.dart
index 18a26a6..6e98034 100644
--- a/lib/src/generated/shapes/paint/radial_gradient_base.dart
+++ b/lib/src/generated/shapes/paint/radial_gradient_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/shapes/paint/linear_gradient_base.dart';
 import 'package:rive/src/rive_core/shapes/paint/linear_gradient.dart';
 
 abstract class RadialGradientBase extends LinearGradient {
diff --git a/lib/src/generated/shapes/paint/solid_color_base.dart b/lib/src/generated/shapes/paint/solid_color_base.dart
index 859f30a..c08d496 100644
--- a/lib/src/generated/shapes/paint/solid_color_base.dart
+++ b/lib/src/generated/shapes/paint/solid_color_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/shapes/paint/solid_color_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class SolidColorBase extends Component {
diff --git a/lib/src/generated/shapes/paint/stroke_base.dart b/lib/src/generated/shapes/paint/stroke_base.dart
index af00520..67cd97a 100644
--- a/lib/src/generated/shapes/paint/stroke_base.dart
+++ b/lib/src/generated/shapes/paint/stroke_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/shapes/paint/shape_paint_base.dart';
 import 'package:rive/src/rive_core/shapes/paint/shape_paint.dart';
 
 abstract class StrokeBase extends ShapePaint {
diff --git a/lib/src/generated/shapes/paint/trim_path_base.dart b/lib/src/generated/shapes/paint/trim_path_base.dart
index 3a5f659..12ece02 100644
--- a/lib/src/generated/shapes/paint/trim_path_base.dart
+++ b/lib/src/generated/shapes/paint/trim_path_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/shapes/paint/trim_path_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class TrimPathBase extends Component {
diff --git a/lib/src/generated/shapes/parametric_path_base.dart b/lib/src/generated/shapes/parametric_path_base.dart
index 6b8323c..749bb5c 100644
--- a/lib/src/generated/shapes/parametric_path_base.dart
+++ b/lib/src/generated/shapes/parametric_path_base.dart
@@ -5,7 +5,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
 import 'package:rive/src/generated/node_base.dart';
-import 'package:rive/src/generated/shapes/path_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/shapes/path.dart';
diff --git a/lib/src/generated/shapes/path_base.dart b/lib/src/generated/shapes/path_base.dart
index c493a82..967619f 100644
--- a/lib/src/generated/shapes/path_base.dart
+++ b/lib/src/generated/shapes/path_base.dart
@@ -3,7 +3,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/node_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/node.dart';
diff --git a/lib/src/generated/shapes/path_composer_base.dart b/lib/src/generated/shapes/path_composer_base.dart
index ddbd0fc..42e3b19 100644
--- a/lib/src/generated/shapes/path_composer_base.dart
+++ b/lib/src/generated/shapes/path_composer_base.dart
@@ -2,7 +2,6 @@
 /// lib/src/generated/shapes/path_composer_base.dart.
 /// Do not modify manually.
 
-import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 
 abstract class PathComposerBase extends Component {
diff --git a/lib/src/generated/shapes/points_path_base.dart b/lib/src/generated/shapes/points_path_base.dart
index 0f367ef..f06beed 100644
--- a/lib/src/generated/shapes/points_path_base.dart
+++ b/lib/src/generated/shapes/points_path_base.dart
@@ -4,7 +4,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
 import 'package:rive/src/generated/node_base.dart';
-import 'package:rive/src/generated/shapes/path_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/shapes/path.dart';
diff --git a/lib/src/generated/shapes/polygon_base.dart b/lib/src/generated/shapes/polygon_base.dart
index c503444..8fa15de 100644
--- a/lib/src/generated/shapes/polygon_base.dart
+++ b/lib/src/generated/shapes/polygon_base.dart
@@ -4,7 +4,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
 import 'package:rive/src/generated/node_base.dart';
-import 'package:rive/src/generated/shapes/parametric_path_base.dart';
 import 'package:rive/src/generated/shapes/path_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
diff --git a/lib/src/generated/shapes/rectangle_base.dart b/lib/src/generated/shapes/rectangle_base.dart
index 29313ed..709d172 100644
--- a/lib/src/generated/shapes/rectangle_base.dart
+++ b/lib/src/generated/shapes/rectangle_base.dart
@@ -4,7 +4,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
 import 'package:rive/src/generated/node_base.dart';
-import 'package:rive/src/generated/shapes/parametric_path_base.dart';
 import 'package:rive/src/generated/shapes/path_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
diff --git a/lib/src/generated/shapes/shape_base.dart b/lib/src/generated/shapes/shape_base.dart
index 6dd4942..552ea85 100644
--- a/lib/src/generated/shapes/shape_base.dart
+++ b/lib/src/generated/shapes/shape_base.dart
@@ -3,7 +3,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/drawable_base.dart';
 import 'package:rive/src/generated/node_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
diff --git a/lib/src/generated/shapes/star_base.dart b/lib/src/generated/shapes/star_base.dart
index 43fe7be..17d229b 100644
--- a/lib/src/generated/shapes/star_base.dart
+++ b/lib/src/generated/shapes/star_base.dart
@@ -6,7 +6,6 @@ import 'package:rive/src/generated/container_component_base.dart';
 import 'package:rive/src/generated/node_base.dart';
 import 'package:rive/src/generated/shapes/parametric_path_base.dart';
 import 'package:rive/src/generated/shapes/path_base.dart';
-import 'package:rive/src/generated/shapes/polygon_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/shapes/polygon.dart';
diff --git a/lib/src/generated/shapes/straight_vertex_base.dart b/lib/src/generated/shapes/straight_vertex_base.dart
index 657cc53..f686ad4 100644
--- a/lib/src/generated/shapes/straight_vertex_base.dart
+++ b/lib/src/generated/shapes/straight_vertex_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/shapes/path_vertex_base.dart';
 import 'package:rive/src/rive_core/bones/weight.dart';
 import 'package:rive/src/rive_core/shapes/path_vertex.dart';
 
diff --git a/lib/src/generated/shapes/triangle_base.dart b/lib/src/generated/shapes/triangle_base.dart
index 652be5c..c3e221f 100644
--- a/lib/src/generated/shapes/triangle_base.dart
+++ b/lib/src/generated/shapes/triangle_base.dart
@@ -4,7 +4,6 @@
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
 import 'package:rive/src/generated/node_base.dart';
-import 'package:rive/src/generated/shapes/parametric_path_base.dart';
 import 'package:rive/src/generated/shapes/path_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/generated/world_transform_component_base.dart';
diff --git a/lib/src/generated/transform_component_base.dart b/lib/src/generated/transform_component_base.dart
index fa2580e..067eb46 100644
--- a/lib/src/generated/transform_component_base.dart
+++ b/lib/src/generated/transform_component_base.dart
@@ -4,7 +4,6 @@
 
 import 'package:rive/src/generated/component_base.dart';
 import 'package:rive/src/generated/container_component_base.dart';
-import 'package:rive/src/generated/world_transform_component_base.dart';
 import 'package:rive/src/rive_core/world_transform_component.dart';
 
 abstract class TransformComponentBase extends WorldTransformComponent {
diff --git a/lib/src/rive_core/animation/keyframe_bool.dart b/lib/src/rive_core/animation/keyframe_bool.dart
index 9bf1554..837cfb0 100644
--- a/lib/src/rive_core/animation/keyframe_bool.dart
+++ b/lib/src/rive_core/animation/keyframe_bool.dart
@@ -1,6 +1,5 @@
 import 'package:rive/src/core/core.dart';
 import 'package:rive/src/generated/animation/keyframe_bool_base.dart';
-import 'package:rive/src/generated/rive_core_context.dart';
 export 'package:rive/src/generated/animation/keyframe_bool_base.dart';
 
 /// KeyFrame for animating bool properties.
diff --git a/lib/src/rive_core/animation/keyframe_color.dart b/lib/src/rive_core/animation/keyframe_color.dart
index 94c8393..899fea5 100644
--- a/lib/src/rive_core/animation/keyframe_color.dart
+++ b/lib/src/rive_core/animation/keyframe_color.dart
@@ -2,7 +2,6 @@ import 'dart:ui';
 
 import 'package:rive/src/core/core.dart';
 import 'package:rive/src/generated/animation/keyframe_color_base.dart';
-import 'package:rive/src/generated/rive_core_context.dart';
 export 'package:rive/src/generated/animation/keyframe_color_base.dart';
 
 void _apply(Core<CoreContext> object, int propertyKey, double mix, int value) {
diff --git a/lib/src/rive_core/animation/keyframe_double.dart b/lib/src/rive_core/animation/keyframe_double.dart
index ec1a07f..398ba8a 100644
--- a/lib/src/rive_core/animation/keyframe_double.dart
+++ b/lib/src/rive_core/animation/keyframe_double.dart
@@ -1,6 +1,5 @@
 import 'package:rive/src/core/core.dart';
 import 'package:rive/src/generated/animation/keyframe_double_base.dart';
-import 'package:rive/src/generated/rive_core_context.dart';
 export 'package:rive/src/generated/animation/keyframe_double_base.dart';
 
 void _apply(
diff --git a/lib/src/rive_core/animation/keyframe_id.dart b/lib/src/rive_core/animation/keyframe_id.dart
index fa6accb..16e4b33 100644
--- a/lib/src/rive_core/animation/keyframe_id.dart
+++ b/lib/src/rive_core/animation/keyframe_id.dart
@@ -1,6 +1,5 @@
 import 'package:rive/src/core/core.dart';
 import 'package:rive/src/generated/animation/keyframe_id_base.dart';
-import 'package:rive/src/generated/rive_core_context.dart';
 export 'package:rive/src/generated/animation/keyframe_id_base.dart';
 
 class KeyFrameId extends KeyFrameIdBase {
diff --git a/lib/src/rive_core/assets/asset.dart b/lib/src/rive_core/assets/asset.dart
index 43f9eae..ea2e17d 100644
--- a/lib/src/rive_core/assets/asset.dart
+++ b/lib/src/rive_core/assets/asset.dart
@@ -1,18 +1,7 @@
 import 'package:rive/src/generated/assets/asset_base.dart';
-import 'package:rive/src/rive_core/backboard.dart';
-
 export 'package:rive/src/generated/assets/asset_base.dart';
 
 class Asset extends AssetBase {
-  Backboard? _backboard;
-  Backboard? get backboard => _backboard;
-  set backboard(Backboard? value) {
-    if (_backboard == value) {
-      return;
-    }
-    _backboard = value;
-  }
-
   @override
   void nameChanged(String from, String to) {}
 
diff --git a/lib/src/rive_core/assets/drawable_asset.dart b/lib/src/rive_core/assets/drawable_asset.dart
index 551c438..7e1cf9c 100644
--- a/lib/src/rive_core/assets/drawable_asset.dart
+++ b/lib/src/rive_core/assets/drawable_asset.dart
@@ -12,7 +12,5 @@ abstract class DrawableAsset extends DrawableAssetBase {
   void widthChanged(double from, double to) {}
 
   @override
-  void assetIdChanged(int from, int to) {
-    width = height = 0;
-  }
+  void assetIdChanged(int from, int to) {}
 }
diff --git a/lib/src/rive_core/assets/file_asset_contents.dart b/lib/src/rive_core/assets/file_asset_contents.dart
index 8303d71..fcddbd6 100644
--- a/lib/src/rive_core/assets/file_asset_contents.dart
+++ b/lib/src/rive_core/assets/file_asset_contents.dart
@@ -16,6 +16,10 @@ class FileAssetContents extends FileAssetContentsBase {
   @override
   void onAddedDirty() {}
 
+  /// Never permanently added to core, so always invalidate.
+  @override
+  bool validate() => false;
+
   @override
   bool import(ImportStack stack) {
     var fileAssetImporter =
diff --git a/lib/src/rive_core/rive_animation_controller.dart b/lib/src/rive_core/rive_animation_controller.dart
index 007cf0e..13b379c 100644
--- a/lib/src/rive_core/rive_animation_controller.dart
+++ b/lib/src/rive_core/rive_animation_controller.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
 
 /// Abstraction for receiving a per frame callback while isPlaying is true to
 /// apply animation based on an elapsed amount of time.
diff --git a/lib/src/rive_core/shapes/paint/shape_paint_mutator.dart b/lib/src/rive_core/shapes/paint/shape_paint_mutator.dart
index 9433dd4..6062bdd 100644
--- a/lib/src/rive_core/shapes/paint/shape_paint_mutator.dart
+++ b/lib/src/rive_core/shapes/paint/shape_paint_mutator.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:rive/src/rive_core/artboard.dart';
 import 'package:rive/src/rive_core/shapes/shape_paint_container.dart';
diff --git a/lib/src/rive_core/transform_component.dart b/lib/src/rive_core/transform_component.dart
index 3fa26c1..d47b439 100644
--- a/lib/src/rive_core/transform_component.dart
+++ b/lib/src/rive_core/transform_component.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/foundation.dart';
-import 'package:rive/src/generated/shapes/clipping_shape_base.dart';
 import 'package:rive/src/generated/transform_component_base.dart';
 import 'package:rive/src/rive_core/component.dart';
 import 'package:rive/src/rive_core/component_dirt.dart';
diff --git a/lib/src/rive_file.dart b/lib/src/rive_file.dart
index dd8f05e..e2819b3 100644
--- a/lib/src/rive_file.dart
+++ b/lib/src/rive_file.dart
@@ -6,15 +6,11 @@ import 'package:flutter/services.dart';
 import 'package:http/http.dart' as http;
 import 'package:rive/src/core/core.dart';
 import 'package:rive/src/core/field_types/core_field_type.dart';
-import 'package:rive/src/core/importers/backboard_importer.dart';
-import 'package:rive/src/core/importers/file_asset_importer.dart';
 import 'package:rive/src/generated/animation/animation_state_base.dart';
 import 'package:rive/src/generated/animation/any_state_base.dart';
 import 'package:rive/src/generated/animation/blend_state_transition_base.dart';
 import 'package:rive/src/generated/animation/entry_state_base.dart';
 import 'package:rive/src/generated/animation/exit_state_base.dart';
-import 'package:rive/src/generated/animation/keyed_property_base.dart';
-import 'package:rive/src/generated/animation/state_machine_base.dart';
 import 'package:rive/src/generated/nested_artboard_base.dart';
 import 'package:rive/src/local_file_io.dart'
     if (dart.library.html) 'package:rive/src/local_file_web.dart';
diff --git a/lib/src/runtime_artboard.dart b/lib/src/runtime_artboard.dart
index a96787b..4cddb23 100644
--- a/lib/src/runtime_artboard.dart
+++ b/lib/src/runtime_artboard.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:rive/rive.dart';
 import 'package:rive/src/core/core.dart';
-import 'package:rive/src/rive_core/artboard.dart';
 import 'package:rive/src/rive_core/component.dart';
 import 'package:rive/src/rive_core/event.dart';
 
diff --git a/lib/src/widgets/rive_animation.dart b/lib/src/widgets/rive_animation.dart
index b1f9855..8f73d8f 100644
--- a/lib/src/widgets/rive_animation.dart
+++ b/lib/src/widgets/rive_animation.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/widgets.dart';
 import 'package:rive/rive.dart';
-import 'package:rive/src/rive_core/artboard.dart';
 
 /// Specifies whether a source is from an asset bundle or http
 enum _Source {