diff --git a/analysis_options.yaml b/analysis_options.yaml
index 0b2ae5884..7750ff7e5 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -7,6 +7,8 @@ analyzer:
     - app/**
     - tools/analyzer_plugin/**
   errors:
+    unused_import: warning
+    duplicate_import: warning
     missing_required_param: error
     must_call_super: error
 linter:
diff --git a/app/over_react_redux/todo_client/lib/src/components/app.dart b/app/over_react_redux/todo_client/lib/src/components/app.dart
index f99170ed3..617ec3704 100644
--- a/app/over_react_redux/todo_client/lib/src/components/app.dart
+++ b/app/over_react_redux/todo_client/lib/src/components/app.dart
@@ -1,5 +1,6 @@
 import 'package:over_react/over_react.dart';
 import 'package:over_react/over_react_redux.dart';
+// ignore: implementation_imports
 import 'package:over_react/src/component/test_fixtures/redraw_counter_component_mixin.dart';
 
 import 'package:todo_client/src/actions.dart';
diff --git a/app/over_react_redux/todo_client/lib/src/components/todo_list.dart b/app/over_react_redux/todo_client/lib/src/components/todo_list.dart
index 3481c8d36..51b3a48b3 100644
--- a/app/over_react_redux/todo_client/lib/src/components/todo_list.dart
+++ b/app/over_react_redux/todo_client/lib/src/components/todo_list.dart
@@ -1,5 +1,6 @@
 import 'package:over_react/over_react.dart';
 import 'package:over_react/over_react_redux.dart';
+// ignore: implementation_imports
 import 'package:over_react/src/component/test_fixtures/redraw_counter_component_mixin.dart';
 
 import 'package:todo_client/src/store.dart';
diff --git a/app/over_react_redux/todo_client/lib/src/components/todo_list_item.dart b/app/over_react_redux/todo_client/lib/src/components/todo_list_item.dart
index 2f88dc196..3fe51bd29 100644
--- a/app/over_react_redux/todo_client/lib/src/components/todo_list_item.dart
+++ b/app/over_react_redux/todo_client/lib/src/components/todo_list_item.dart
@@ -2,6 +2,7 @@ import 'dart:html';
 
 import 'package:over_react/over_react.dart';
 import 'package:over_react/over_react_redux.dart';
+// ignore: implementation_imports
 import 'package:over_react/src/component/test_fixtures/redraw_counter_component_mixin.dart';
 
 import 'package:todo_client/src/actions.dart';
diff --git a/app/over_react_redux/todo_client/lib/src/components/user_list.dart b/app/over_react_redux/todo_client/lib/src/components/user_list.dart
index 24290e223..0f9c15741 100644
--- a/app/over_react_redux/todo_client/lib/src/components/user_list.dart
+++ b/app/over_react_redux/todo_client/lib/src/components/user_list.dart
@@ -1,5 +1,6 @@
 import 'package:over_react/over_react.dart';
 import 'package:over_react/over_react_redux.dart';
+// ignore: implementation_imports
 import 'package:over_react/src/component/test_fixtures/redraw_counter_component_mixin.dart';
 
 import 'package:todo_client/src/store.dart';
diff --git a/app/over_react_redux/todo_client/lib/src/components/user_list_item.dart b/app/over_react_redux/todo_client/lib/src/components/user_list_item.dart
index 567b5593a..dcbb09c7d 100644
--- a/app/over_react_redux/todo_client/lib/src/components/user_list_item.dart
+++ b/app/over_react_redux/todo_client/lib/src/components/user_list_item.dart
@@ -2,6 +2,7 @@ import 'dart:html';
 
 import 'package:over_react/over_react.dart';
 import 'package:over_react/over_react_redux.dart';
+// ignore: implementation_imports
 import 'package:over_react/src/component/test_fixtures/redraw_counter_component_mixin.dart';
 
 import 'package:todo_client/src/actions.dart';
diff --git a/app/over_react_redux/todo_client/lib/src/components/user_selector.dart b/app/over_react_redux/todo_client/lib/src/components/user_selector.dart
index e166168b0..b579045da 100644
--- a/app/over_react_redux/todo_client/lib/src/components/user_selector.dart
+++ b/app/over_react_redux/todo_client/lib/src/components/user_selector.dart
@@ -2,6 +2,7 @@ library todo_client.src.components.user_selector;
 
 import 'package:over_react/over_react.dart';
 import 'package:over_react/over_react_redux.dart';
+// ignore: implementation_imports
 import 'package:over_react/src/component/test_fixtures/redraw_counter_component_mixin.dart';
 
 import 'package:todo_client/src/store.dart';
diff --git a/app/over_react_redux/todo_client/test/unit/browser/components/fixtures/utils.dart b/app/over_react_redux/todo_client/test/unit/browser/components/fixtures/utils.dart
index cfa43b5cd..06bfd559e 100644
--- a/app/over_react_redux/todo_client/test/unit/browser/components/fixtures/utils.dart
+++ b/app/over_react_redux/todo_client/test/unit/browser/components/fixtures/utils.dart
@@ -16,7 +16,6 @@ bool muiJsIsAvailable() {
 }
 
 void initializeComponentTests() {
-  setClientConfiguration();
   enableTestMode();
   if (!muiJsIsAvailable()) return;
 }
diff --git a/app/over_react_redux/todo_client/test/unit/browser/components/js_interop_test.dart b/app/over_react_redux/todo_client/test/unit/browser/components/js_interop_test.dart
index 144e30cb0..b3044b701 100644
--- a/app/over_react_redux/todo_client/test/unit/browser/components/js_interop_test.dart
+++ b/app/over_react_redux/todo_client/test/unit/browser/components/js_interop_test.dart
@@ -14,7 +14,6 @@ import 'package:todo_client/src/utils.dart';
 external JsMap get mockJsMap;
 
 main() {
-  setClientConfiguration();
   JsBackedMap mockJsBackedMap;
 
   setUpAll(() async {
diff --git a/app/over_react_redux/todo_client/test/unit/browser/components/material_ui_test.dart b/app/over_react_redux/todo_client/test/unit/browser/components/material_ui_test.dart
index ada6e1f8e..4e923c142 100644
--- a/app/over_react_redux/todo_client/test/unit/browser/components/material_ui_test.dart
+++ b/app/over_react_redux/todo_client/test/unit/browser/components/material_ui_test.dart
@@ -7,7 +7,6 @@ import 'package:todo_client/src/components/shared/material_ui.dart';
 import 'fixtures/utils.dart';
 
 main() {
-  setClientConfiguration();
   if (!muiJsIsAvailable()) return;
 
   group('MaterialUI', () {
diff --git a/app/over_react_redux/todo_client/test/unit/browser/redux/store_test.dart b/app/over_react_redux/todo_client/test/unit/browser/redux/store_test.dart
index 189dc0fa7..604881ac9 100644
--- a/app/over_react_redux/todo_client/test/unit/browser/redux/store_test.dart
+++ b/app/over_react_redux/todo_client/test/unit/browser/redux/store_test.dart
@@ -1,7 +1,6 @@
 @TestOn('browser')
 import 'dart:convert';
 
-import 'package:over_react/over_react.dart';
 import 'package:test/test.dart';
 
 import 'package:todo_client/src/actions.dart';
@@ -13,7 +12,6 @@ import 'package:todo_client/src/store.dart';
 import '../fixtures/utils.dart';
 
 main() {
-  setClientConfiguration();
   const reasonCurrentSetShouldBePersisted =
         'The state update should be persisted as the "current" set in window.localStorage';
 
diff --git a/app/over_react_redux/todo_client/web/main.dart b/app/over_react_redux/todo_client/web/main.dart
index a29a443c0..ce53351e0 100644
--- a/app/over_react_redux/todo_client/web/main.dart
+++ b/app/over_react_redux/todo_client/web/main.dart
@@ -1,14 +1,11 @@
 import 'dart:html';
 
-import 'package:over_react/over_react.dart';
 import 'package:over_react/react_dom.dart' as react_dom;
 import 'package:over_react/over_react_redux.dart';
 
 import 'package:todo_client/todo_client.dart';
 
 main() {
-  setClientConfiguration();
-
   final container = querySelector('#todo-container');
 
   final app = (ReduxProvider()..store = getStore())(
diff --git a/example/builder/main.dart b/example/builder/main.dart
index fc657bc21..1ee59c63d 100644
--- a/example/builder/main.dart
+++ b/example/builder/main.dart
@@ -25,8 +25,6 @@ import './src/generic_inheritance_super.dart';
 import './src/function_component.dart' as function;
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
       Dom.div()(
         Dom.h3()('Components'),
diff --git a/example/builder/src/basic_with_state.dart b/example/builder/src/basic_with_state.dart
index f6a34a445..81fd407e5 100644
--- a/example/builder/src/basic_with_state.dart
+++ b/example/builder/src/basic_with_state.dart
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 import 'package:over_react/over_react.dart';
-import 'props_mixin.dart' as pm;
-import 'state_mixin.dart';
 
 part 'basic_with_state.over_react.g.dart';
 
diff --git a/example/builder/src/private_component.dart b/example/builder/src/private_component.dart
index ff7076a15..7742690ba 100644
--- a/example/builder/src/private_component.dart
+++ b/example/builder/src/private_component.dart
@@ -16,7 +16,7 @@ import 'package:over_react/over_react.dart';
 
 part 'private_component.over_react.g.dart';
 
-UiFactory<_PrivateProps> _Private = _$_Private; // ignore: undefined_identifier
+UiFactory<_PrivateProps> _Private = _$_Private; // ignore: undefined_identifier, unused_element
 
 mixin _PrivateProps on UiProps {
   bool prop1;
diff --git a/example/builder/src/with_legacy_props_mixin.dart b/example/builder/src/with_legacy_props_mixin.dart
index e45f44e81..c6698bbd9 100644
--- a/example/builder/src/with_legacy_props_mixin.dart
+++ b/example/builder/src/with_legacy_props_mixin.dart
@@ -22,6 +22,7 @@ mixin BasicPropsMixin on UiProps {
   String basicProp;
 }
 
+// ignore: deprecated_member_use_from_same_package
 class BasicProps = UiProps with BasicPropsMixin, TransitionPropsMixin;
 
 class BasicComponent extends UiComponent2<BasicProps> {
diff --git a/example/context/main.dart b/example/context/main.dart
index e0e3dca69..c3662f9f6 100644
--- a/example/context/main.dart
+++ b/example/context/main.dart
@@ -16,15 +16,12 @@ import 'dart:html';
 
 import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 import './components/my_provider_component.dart';
 import './components/my_context_component.dart';
 import './context.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
     v2.ErrorBoundary()(
       MyProvider()(
diff --git a/lib/over_react.dart b/lib/over_react.dart
index ce8f95ef6..ede2aa288 100644
--- a/lib/over_react.dart
+++ b/lib/over_react.dart
@@ -34,6 +34,7 @@ export 'package:react/react.dart'
 export 'package:react/react_client/js_backed_map.dart' show JsBackedMap;
 
 export 'package:react/react_client.dart'
+    // ignore: deprecated_member_use
     show setClientConfiguration, ReactElement, ReactComponentFactoryProxy;
 export 'package:react/react_client/react_interop.dart' show ReactErrorInfo, Ref;
 export 'package:react/hooks.dart' show StateHook, ReducerHook;
diff --git a/lib/src/builder/codegen/names.dart b/lib/src/builder/codegen/names.dart
index 4e46fee68..57b8ff95f 100644
--- a/lib/src/builder/codegen/names.dart
+++ b/lib/src/builder/codegen/names.dart
@@ -43,7 +43,7 @@ class FactoryNames {
   ///
   /// - Input: `Foo`
   /// - Output: `_$Foo`
-  String get implName => '$_prefix$privateSourcePrefix${unprefixedConsumerName}';
+  String get implName => '$_prefix$privateSourcePrefix$unprefixedConsumerName';
 
   /// The name of the generated function component props config for the factory.
   ///
diff --git a/lib/src/builder/parsing/declarations_from_members.dart b/lib/src/builder/parsing/declarations_from_members.dart
index 59f74f1d1..1532ecc4c 100644
--- a/lib/src/builder/parsing/declarations_from_members.dart
+++ b/lib/src/builder/parsing/declarations_from_members.dart
@@ -69,7 +69,6 @@ Iterable<BoilerplateDeclaration> getBoilerplateDeclarations(
   if (members.isEmpty) return;
 
   final _consumedMembers = <BoilerplateMember>{};
-  final _functionComponentFactories = <BoilerplateFactory>{};
 
   /// Indicate that [member] has been grouped into a declaration,
   /// so that it is not grouped into another declaration.
diff --git a/lib/src/builder/parsing/members/props_and_state_util.dart b/lib/src/builder/parsing/members/props_and_state_util.dart
index d8c09c705..811eeaf3b 100644
--- a/lib/src/builder/parsing/members/props_and_state_util.dart
+++ b/lib/src/builder/parsing/members/props_and_state_util.dart
@@ -55,9 +55,11 @@ annotations.TypedMap getPropsOrStateAnnotation(bool isProps, AnnotatedNode node)
   final meta = isProps
       ? (InstantiatedMeta<annotations.Props>(node) ??
           InstantiatedMeta<annotations.AbstractProps>(node) ??
+          // ignore: deprecated_member_use_from_same_package
           InstantiatedMeta<annotations.PropsMixin>(node))
       : (InstantiatedMeta<annotations.State>(node) ??
           InstantiatedMeta<annotations.AbstractState>(node) ??
+          // ignore: deprecated_member_use_from_same_package
           InstantiatedMeta<annotations.StateMixin>(node));
 
   return meta?.value ?? (isProps ? annotations.Props() : annotations.State());
diff --git a/lib/src/component/_deprecated/abstract_transition.dart b/lib/src/component/_deprecated/abstract_transition.dart
index 8bb08028a..8487f8663 100644
--- a/lib/src/component/_deprecated/abstract_transition.dart
+++ b/lib/src/component/_deprecated/abstract_transition.dart
@@ -159,7 +159,7 @@ abstract class AbstractTransitionComponent<T extends AbstractTransitionProps,
 
   /// Begin showing the [AbstractTransitionComponent], unless:
   ///   * The [AbstractTransitionComponent] is already shown or is in the process of showing.
-  ///   * The [AbstractTransitionProps.onWillShow] callback returns `false`.
+  ///   * The [TransitionPropsMixin.onWillShow] callback returns `false`.
   void _handleShow() {
     if (isOrWillBeShown) {
       return;
@@ -179,7 +179,7 @@ abstract class AbstractTransitionComponent<T extends AbstractTransitionProps,
 
   /// Begin hiding the [AbstractTransitionComponent], unless:
   ///   * The [AbstractTransitionComponent] is already hidden or is in the process of being hidden.
-  ///   * The [AbstractTransitionProps.onWillHide] callback returns `false`.
+  ///   * The [TransitionPropsMixin.onWillHide] callback returns `false`.
   void _handleHide() {
     if (isOrWillBeHidden) {
       return;
@@ -426,7 +426,7 @@ abstract class AbstractTransitionComponent<T extends AbstractTransitionProps,
     _handleHide();
   }
 
-  /// Toggles the visibility of the [AbstractTransitionComponent] based on the value of [AbstractTransitionState.transitionPhase].
+  /// Toggles the visibility of the [AbstractTransitionComponent] based on the value of `AbstractTransitionState.transitionPhase`.
   void toggle() {
     if (isOrWillBeShown) {
       /// If the [AbstractTransitionComponent] is shown or in the process of showing, hide it.
diff --git a/lib/src/component/_deprecated/error_boundary.dart b/lib/src/component/_deprecated/error_boundary.dart
index afc032c8f..f50ae6674 100644
--- a/lib/src/component/_deprecated/error_boundary.dart
+++ b/lib/src/component/_deprecated/error_boundary.dart
@@ -146,6 +146,7 @@ class ErrorBoundaryComponent<T extends ErrorBoundaryProps, S extends ErrorBounda
   ///
   /// This can be called manually on the component instance using a `ref` -
   /// or by passing in a new child instance after a child has thrown an error.
+  @override
   void reset() {
     setState(initialState);
   }
diff --git a/lib/src/component/_deprecated/error_boundary_mixins.dart b/lib/src/component/_deprecated/error_boundary_mixins.dart
index 1bdc4aa54..85a55d944 100644
--- a/lib/src/component/_deprecated/error_boundary_mixins.dart
+++ b/lib/src/component/_deprecated/error_boundary_mixins.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 import 'dart:async';
 
 import 'package:logging/logging.dart';
@@ -369,8 +370,8 @@ mixin ErrorBoundaryMixin<T extends ErrorBoundaryPropsMixin, S extends ErrorBound
     )();
   }
 
-  /// Called via [componentDidCatch] to start a `Timer` that will nullify the [_lastError] and [_lastErrorInfo]
-  /// internal fields that keep track of the last error thrown.
+  /// Called via [componentDidCatch] to start a `Timer` that will nullify the [_domAtTimeOfError]
+  /// internal field that keeps track of the last error thrown.
   ///
   /// If an identical error is thrown by an identical child component twice in a row:
   ///
diff --git a/lib/src/component/aria_mixin.dart b/lib/src/component/aria_mixin.dart
index 512d58279..e8193f3bf 100644
--- a/lib/src/component/aria_mixin.dart
+++ b/lib/src/component/aria_mixin.dart
@@ -36,6 +36,7 @@ abstract class $AriaPropsMixin {
 
 /// Typed getters/setters for accessibility props.
 /// To be used as a mixin for React components and builders.
+// ignore: deprecated_member_use_from_same_package
 @PropsMixin(keyNamespace: '')
 abstract class _$AriaPropsMixin {
   Map get props;
diff --git a/lib/src/component/dummy_component2.dart b/lib/src/component/dummy_component2.dart
index c231b2535..076bac551 100644
--- a/lib/src/component/dummy_component2.dart
+++ b/lib/src/component/dummy_component2.dart
@@ -17,7 +17,7 @@ import 'package:over_react/over_react.dart';
 part 'dummy_component2.over_react.g.dart';
 
 @Factory()
-// ignore: undefined_identifier
+// ignore: undefined_identifier, unused_element
 UiFactory<_Dummy2Props> _Dummy2 = _$_Dummy2;
 
 @Props()
diff --git a/lib/src/component/error_boundary_recoverable.dart b/lib/src/component/error_boundary_recoverable.dart
index f11d623ff..a05d5469f 100644
--- a/lib/src/component/error_boundary_recoverable.dart
+++ b/lib/src/component/error_boundary_recoverable.dart
@@ -200,8 +200,8 @@ class RecoverableErrorBoundaryComponent<T extends RecoverableErrorBoundaryProps,
     )();
   }
 
-  /// Called via [componentDidCatch] to start a `Timer` that will nullify the [_lastError] and [_lastErrorInfo]
-  /// internal fields that keep track of the last error thrown.
+  /// Called via [componentDidCatch] to start a `Timer` that will nullify the [_domAtTimeOfError]
+  /// internal field that keeps track of the last error thrown.
   ///
   /// If an identical error is thrown by an identical child component twice in a row:
   ///
@@ -210,7 +210,7 @@ class RecoverableErrorBoundaryComponent<T extends RecoverableErrorBoundaryProps,
   /// * __After the timer's callback fires__ - internal component logic will NOT treat the second error
   ///   as an unrecoverable one.
   ///
-  /// > Not used when [ErrorBoundaryPropsMixin.fallbackUIRenderer] is set.
+  /// > Not used when `ErrorBoundaryProps.fallbackUIRenderer` is set.
   void _startIdenticalErrorTimer() {
     if (_identicalErrorTimer != null) return;
 
diff --git a/lib/src/component/fragment_component.dart b/lib/src/component/fragment_component.dart
index 9bed779b5..ba783512b 100644
--- a/lib/src/component/fragment_component.dart
+++ b/lib/src/component/fragment_component.dart
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'package:over_react/src/component_declaration/component_base.dart'
-    as component_base;
 import 'package:over_react/src/component_declaration/builder_helpers.dart'
     as builder_helpers;
 import 'package:react/react_client.dart';
diff --git a/lib/src/component/hooks.dart b/lib/src/component/hooks.dart
index 9d2856dd2..0f8cd34ba 100644
--- a/lib/src/component/hooks.dart
+++ b/lib/src/component/hooks.dart
@@ -325,7 +325,7 @@ Ref<T> useRef<T>([T initialValue]) => react_hooks.useRef(initialValue);
 
 /// Returns a memoized version of the return value of [createFunction].
 ///
-/// If one of the [dependencies] has changed, [createFunction] is run during rendering of the [DartFunctionComponent].
+/// If one of the [dependencies] has changed, [createFunction] is run during rendering of the dart function component.
 /// This optimization helps to avoid expensive calculations on every render.
 ///
 /// > __Note:__ there are two [rules for using Hooks](https://reactjs.org/docs/hooks-rules.html):
@@ -362,7 +362,7 @@ Ref<T> useRef<T>([T initialValue]) => react_hooks.useRef(initialValue);
 T useMemo<T>(T Function() createFunction, [List<dynamic> dependencies]) =>
     react_hooks.useMemo(createFunction, dependencies);
 
-/// Runs [sideEffect] synchronously after a [DartFunctionComponent] renders, but before the screen is updated.
+/// Runs [sideEffect] synchronously after a dart function component renders, but before the screen is updated.
 ///
 /// Compare to [useEffect] which runs [sideEffect] after the screen updates.
 /// Prefer the standard [useEffect] when possible to avoid blocking visual updates.
@@ -403,7 +403,7 @@ T useMemo<T>(T Function() createFunction, [List<dynamic> dependencies]) =>
 /// Learn more: <https://reactjs.org/docs/hooks-reference.html#uselayouteffect>.
 void useLayoutEffect(dynamic Function() sideEffect, [List<Object> dependencies]) => react_hooks.useLayoutEffect(sideEffect, dependencies);
 
-/// Customizes the [ref] value that is exposed to parent components when using [uiForwardRef] by setting [ref.current]
+/// Customizes the [ref] value that is exposed to parent components when using [uiForwardRef] by setting [Ref.current]
 /// to the return value of [createHandle].
 ///
 /// In most cases, imperative code using refs should be avoided.
@@ -544,4 +544,4 @@ void useImperativeHandle(Ref ref, dynamic Function() createHandle, [List<dynamic
 /// ```
 ///
 /// Learn more: <https://reactjs.org/docs/hooks-reference.html#usedebugvalue>.
-dynamic useDebugValue<T>(T value, [dynamic Function(T) format]) => react_hooks.useDebugValue(value, format);
\ No newline at end of file
+dynamic useDebugValue<T>(T value, [dynamic Function(T) format]) => react_hooks.useDebugValue(value, format);
diff --git a/lib/src/component/prop_mixins.dart b/lib/src/component/prop_mixins.dart
index b503021e8..5a8799a89 100644
--- a/lib/src/component/prop_mixins.dart
+++ b/lib/src/component/prop_mixins.dart
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
+
 /// Various prop related mixins to be used with `UiComponent` descendants.
 library over_react.prop_mixins;
 
diff --git a/lib/src/component/pure_component_mixin.dart b/lib/src/component/pure_component_mixin.dart
index ce8a3b9ab..5250def3c 100644
--- a/lib/src/component/pure_component_mixin.dart
+++ b/lib/src/component/pure_component_mixin.dart
@@ -14,7 +14,7 @@
 
 import 'package:over_react/over_react.dart';
 
-/// A mixin to make a [react.Component2] instance behave
+/// A mixin to make a `Component2` instance behave
 /// like a [ReactJS `PureComponent`](https://reactjs.org/docs/react-api.html#reactpurecomponent).
 ///
 /// The value of `props.children` is not compared deeply by default. Any time a new `ReactElement`
diff --git a/lib/src/component/resize_sensor.dart b/lib/src/component/resize_sensor.dart
index 3a50a6c29..98f01088a 100644
--- a/lib/src/component/resize_sensor.dart
+++ b/lib/src/component/resize_sensor.dart
@@ -25,7 +25,7 @@ import 'package:over_react/src/component/resize_sensor_constants.dart';
 part 'resize_sensor.over_react.g.dart';
 
 /// A wrapper component that detects when its parent is resized, providing a [ResizeSensorEvent]
-/// as a callback argument to [ResizeSensorPropsMixin.onResize].
+/// as a callback argument to [ResizeSensorProps.onResize].
 ///
 /// Intended for use as a [https://wicg.github.io/ResizeObserver/](`ResizeObserver`) polyfill.
 ///
@@ -41,7 +41,7 @@ part 'resize_sensor.over_react.g.dart';
 ///     )
 ///
 /// If your implementation needs to know what the dimensions of the node were when it first mounted,
-/// [ResizeSensorPropsMixin.onInitialize] can be set, _as long as [ResizeSensorPropsMixin.quickMount] is `false`_.
+/// [ResizeSensorProps.onInitialize] can be set, _as long as [ResizeSensorProps.quickMount] is `false`_.
 ///
 ///     (ResizeSensor()
 ///       ..onInitialize = (ResizeSensorEvent event) {
@@ -307,21 +307,21 @@ class ResizeSensorComponent extends UiComponent2<ResizeSensorProps> with SafeAni
   ///
   /// ### How do I know if I need to call this? ###
   ///
-  /// If you have a [ResizeSensor] that is not emitting its [ResizeSensorPropsMixin.onResize] events,
+  /// If you have a [ResizeSensor] that is not emitting its [ResizeSensorProps.onResize] events,
   /// then the sensor was most likely mounted detached from the DOM.
-  /// In that situation, set the [ResizeSensorPropsMixin.onDetachedMountCheck] callback and use a `true`
+  /// In that situation, set the [ResizeSensorProps.onDetachedMountCheck] callback and use a `true`
   /// return value to give your application knowledge that a call to this method _(at a time when you are
-  /// sure that the sensor has become attached to the DOM)_ to repair the [ResizeSensorPropsMixin.onResize] behavior.
+  /// sure that the sensor has become attached to the DOM)_ to repair the [ResizeSensorProps.onResize] behavior.
   ///
-  /// > __See: [ResizeSensorPropsMixin.onDetachedMountCheck] for more information.__
+  /// > __See: [ResizeSensorProps.onDetachedMountCheck] for more information.__
   void forceResetDetachedSensor() => _reset();
 
   /// Returns whether the node rendered by this component was attached to the DOM when it was mounted.
   ///
   /// A `false` return value indicates that a call to [forceResetDetachedSensor]
-  /// is necessary to ensure the [ResizeSensorPropsMixin.onResize] callback is emitted as expected.
+  /// is necessary to ensure the [ResizeSensorProps.onResize] callback is emitted as expected.
   ///
-  /// > __See: [ResizeSensorPropsMixin.onDetachedMountCheck] for more information.__
+  /// > __See: [ResizeSensorProps.onDetachedMountCheck] for more information.__
   bool _isAttachedToDocument() {
     Node current = findDomNode(this);
     while (current != null) {
@@ -331,7 +331,7 @@ class ResizeSensorComponent extends UiComponent2<ResizeSensorProps> with SafeAni
     return false;
   }
 
-  /// See: [ResizeSensorPropsMixin.onDetachedMountCheck]
+  /// See: [ResizeSensorProps.onDetachedMountCheck]
   void _checkForDetachedMount() {
     // Only perform this check if the consumer sets the callback.
     if (props.onDetachedMountCheck == null) return;
@@ -370,7 +370,7 @@ class ResizeSensorComponent extends UiComponent2<ResizeSensorProps> with SafeAni
 
 /// Used with [ResizeSensorHandler] to provide information about a resize.
 ///
-/// > Emitted via [ResizeSensorPropsMixin.onResize] and [ResizeSensorPropsMixin.onInitialize].
+/// > Emitted via [ResizeSensorProps.onResize] and [ResizeSensorProps.onInitialize].
 class ResizeSensorEvent {
   /// The new width, in pixels.
   final int newWidth;
diff --git a/lib/src/component/strictmode_component.dart b/lib/src/component/strictmode_component.dart
index 1e493c1e5..529ac315e 100644
--- a/lib/src/component/strictmode_component.dart
+++ b/lib/src/component/strictmode_component.dart
@@ -42,7 +42,7 @@ class StrictModeProps extends component_base.UiProps
 /// > Note:
 /// > Strict mode checks are run in development mode only; they do not impact the production build.
 ///
-/// Like [Fragment], [StrictMode] does not render any visible UI.
+/// Like [react.Fragment], [StrictMode] does not render any visible UI.
 /// It activates additional checks and warnings for its descendants.
 /// [StrictMode] currently helps with:
 /// - Identifying components with unsafe lifecycles
diff --git a/lib/src/component_declaration/component_base.dart b/lib/src/component_declaration/component_base.dart
index d8b9ff9e5..46a123e95 100644
--- a/lib/src/component_declaration/component_base.dart
+++ b/lib/src/component_declaration/component_base.dart
@@ -799,7 +799,7 @@ class PropsMeta implements ConsumedProps, AccessorMeta<PropDescriptor> {
 
   /// A convenience constructor to make a metadata object for a single key.
   ///
-  /// Useful within [UiComponent.consumedProps].
+  /// Useful within `UiComponent2.consumedProps`.
   ///
   /// Example:
   ///
diff --git a/lib/src/component_declaration/component_base_2.dart b/lib/src/component_declaration/component_base_2.dart
index 7f81b055e..d4f68a9d1 100644
--- a/lib/src/component_declaration/component_base_2.dart
+++ b/lib/src/component_declaration/component_base_2.dart
@@ -55,6 +55,7 @@ ReactDartComponentFactoryProxy2 registerAbstractComponent2(Type abstractComponen
 ReactDartComponentFactoryProxy2 registerComponent2(react.Component2 Function() dartComponentFactory, {
     bool isWrapper = false,
     // This must remain typed in a way that both UiComponent and UiComponent2 classes can be passed as the `subtypeOf` value.
+    // ignore: deprecated_member_use
     ReactDartComponentFactoryProxy parentType,
     UiFactory builderFactory,
     Type componentClass,
@@ -782,7 +783,7 @@ class UiComponent2BridgeImpl extends Component2BridgeImpl {
 
   /// A version of [setStateWithTypedUpdater] whose updater is passed typed views
   /// into the `prevState` and `props` arguments, allowing them to be typed automatically
-  /// within [UiStatefulComponent2.setStateWithUpdater].
+  /// within `UiStatefulComponent2.setStateWithUpdater`.
   void setStateWithTypedUpdater<TState extends UiState, TProps extends UiProps>(
     UiStatefulMixin2<TProps, TState> component,
     Map Function(TState prevState, TProps props) updater,
diff --git a/lib/src/over_react_redux/over_react_flux.dart b/lib/src/over_react_redux/over_react_flux.dart
index 651f9bfaf..1e51fac36 100644
--- a/lib/src/over_react_redux/over_react_flux.dart
+++ b/lib/src/over_react_redux/over_react_flux.dart
@@ -37,6 +37,7 @@ abstract class $ConnectFluxPropsMixin {
   static const PropsMeta meta = _$metaForConnectFluxPropsMixin;
 }
 
+// ignore: deprecated_member_use_from_same_package
 @PropsMixin(keyNamespace: '')
 abstract class _$ConnectFluxPropsMixin<TActions> implements UiProps {
   @override
diff --git a/lib/src/over_react_redux/over_react_redux.dart b/lib/src/over_react_redux/over_react_redux.dart
index 0ecc4d2e7..3608724b2 100644
--- a/lib/src/over_react_redux/over_react_redux.dart
+++ b/lib/src/over_react_redux/over_react_redux.dart
@@ -43,6 +43,7 @@ abstract class $ConnectPropsMixin {
   static const PropsMeta meta = _$metaForConnectPropsMixin;
 }
 
+// ignore: deprecated_member_use_from_same_package
 @PropsMixin(keyNamespace: '')
 abstract class _$ConnectPropsMixin implements UiProps {
   @override
diff --git a/lib/src/util/class_names.dart b/lib/src/util/class_names.dart
index f38041536..18d6279d1 100644
--- a/lib/src/util/class_names.dart
+++ b/lib/src/util/class_names.dart
@@ -20,7 +20,9 @@ import 'dart:collection';
 
 import 'package:over_react/over_react.dart' show
     // Must import these consts because they are used in the transformed code.
-    PropDescriptor, ConsumedProps, // ignore: unused_shown_name
+    // ignore: unused_shown_name
+    PropDescriptor, ConsumedProps,
+    // ignore: unused_shown_name
     PropsMeta, UiComponent, UiProps;
 import 'package:over_react/src/component_declaration/annotations.dart';
 
@@ -48,13 +50,13 @@ abstract class _$CssClassPropsMixin {
   /// String of space-delimited CSS classes to be added to the resultant DOM.
   ///
   /// All over_react components merge any added classes with this prop and the [classNameBlacklist] prop (see
-  /// [UiComponent.forwardingClassNameBuilder]).
+  /// `UiComponent.forwardingClassNameBuilder`).
   String className;
 
   /// String of space-delimited CSS classes to be blacklisted from being added to the resultant DOM.
   ///
   /// All over_react components merge any added classes with this prop and the [className] prop (see
-  /// [UiComponent.forwardingClassNameBuilder]).
+  /// `UiComponent.forwardingClassNameBuilder`).
   String classNameBlacklist;
 }
 
@@ -79,7 +81,7 @@ class ClassNameBuilder {
 
   /// Creates a new, empty `ClassNameBuilder` instance.
   ///
-  /// > Related: [UiComponent.forwardingClassNameBuilder]
+  /// > Related: `UiComponent.forwardingClassNameBuilder`
   ClassNameBuilder();
 
   /// Creates a new `ClassNameBuilder` with the [CssClassPropsMixin.className] values and
diff --git a/lib/src/util/class_names.over_react.g.dart b/lib/src/util/class_names.over_react.g.dart
index 8126e0415..391c9f007 100644
--- a/lib/src/util/class_names.over_react.g.dart
+++ b/lib/src/util/class_names.over_react.g.dart
@@ -16,7 +16,7 @@ abstract class CssClassPropsMixin implements _$CssClassPropsMixin {
   /// String of space-delimited CSS classes to be added to the resultant DOM.
   ///
   /// All over_react components merge any added classes with this prop and the [classNameBlacklist] prop (see
-  /// [UiComponent.forwardingClassNameBuilder]).
+  /// `UiComponent.forwardingClassNameBuilder`).
   ///
   /// <!-- Generated from [_$CssClassPropsMixin.className] -->
   @override
@@ -26,7 +26,7 @@ abstract class CssClassPropsMixin implements _$CssClassPropsMixin {
   /// String of space-delimited CSS classes to be added to the resultant DOM.
   ///
   /// All over_react components merge any added classes with this prop and the [classNameBlacklist] prop (see
-  /// [UiComponent.forwardingClassNameBuilder]).
+  /// `UiComponent.forwardingClassNameBuilder`).
   ///
   /// <!-- Generated from [_$CssClassPropsMixin.className] -->
   @override
@@ -36,7 +36,7 @@ abstract class CssClassPropsMixin implements _$CssClassPropsMixin {
   /// String of space-delimited CSS classes to be blacklisted from being added to the resultant DOM.
   ///
   /// All over_react components merge any added classes with this prop and the [className] prop (see
-  /// [UiComponent.forwardingClassNameBuilder]).
+  /// `UiComponent.forwardingClassNameBuilder`).
   ///
   /// <!-- Generated from [_$CssClassPropsMixin.classNameBlacklist] -->
   @override
@@ -46,7 +46,7 @@ abstract class CssClassPropsMixin implements _$CssClassPropsMixin {
   /// String of space-delimited CSS classes to be blacklisted from being added to the resultant DOM.
   ///
   /// All over_react components merge any added classes with this prop and the [className] prop (see
-  /// [UiComponent.forwardingClassNameBuilder]).
+  /// `UiComponent.forwardingClassNameBuilder`).
   ///
   /// <!-- Generated from [_$CssClassPropsMixin.classNameBlacklist] -->
   @override
diff --git a/lib/src/util/dom_util.dart b/lib/src/util/dom_util.dart
index 6a691c0b5..2dba26e82 100644
--- a/lib/src/util/dom_util.dart
+++ b/lib/src/util/dom_util.dart
@@ -48,8 +48,8 @@ Element closest(Element lowerBound, String selector, {Element upperBound}) {
   return null;
 }
 
-/// Returns the currently focused element ([HtmlDocument.activeElement]),
-/// or `null` if nothing is focused (e.g. [HtmlDocument.activeElement] is [BodyElement]).
+/// Returns the currently focused element ([Document.activeElement]),
+/// or `null` if nothing is focused (e.g. [Document.activeElement] is [BodyElement]).
 Element getActiveElement() {
   var activeElement = document.activeElement;
 
diff --git a/lib/src/util/react_util.dart b/lib/src/util/react_util.dart
index 4479c8b5b..f7c2f3918 100644
--- a/lib/src/util/react_util.dart
+++ b/lib/src/util/react_util.dart
@@ -21,7 +21,7 @@ import 'package:react/react_client.dart';
 
 /// A `MapView` helper that stubs in unimplemented pieces of [UiProps].
 ///
-/// Useful when you need a `MapView` for a [PropsMixin] that implements [UiProps].
+/// Useful when you need a `MapView` for a `PropsMixin` that implements [UiProps].
 class UiPropsMapView extends MapView
     with
         ReactPropsMixin,
diff --git a/test/over_react/component_declaration/builder_integration_tests/accessor_mixin_integration_test.dart b/test/over_react/component_declaration/builder_integration_tests/accessor_mixin_integration_test.dart
index 5f4335deb..53216ec02 100644
--- a/test/over_react/component_declaration/builder_integration_tests/accessor_mixin_integration_test.dart
+++ b/test/over_react/component_declaration/builder_integration_tests/accessor_mixin_integration_test.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 @TestOn('browser')
 
 import 'package:over_react/over_react.dart';
diff --git a/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart b/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart
index 259c3a912..dac4503b7 100644
--- a/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart
+++ b/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 @TestOn('browser')
 
 import 'package:over_react/over_react.dart';
diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/accessor_mixin_integration_test.dart b/test/over_react/component_declaration/builder_integration_tests/component2/accessor_mixin_integration_test.dart
index 7e5b496c0..9fc996bb5 100644
--- a/test/over_react/component_declaration/builder_integration_tests/component2/accessor_mixin_integration_test.dart
+++ b/test/over_react/component_declaration/builder_integration_tests/component2/accessor_mixin_integration_test.dart
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+// ignore_for_file: deprecated_member_use_from_same_package
 import 'package:over_react/over_react.dart';
 import 'package:test/test.dart';
 
diff --git a/test/over_react/component_declaration/builder_integration_tests/new_boilerplate/accessor_mixin_integration_test.dart b/test/over_react/component_declaration/builder_integration_tests/new_boilerplate/accessor_mixin_integration_test.dart
index d00b7dcbe..fd8e04cfd 100644
--- a/test/over_react/component_declaration/builder_integration_tests/new_boilerplate/accessor_mixin_integration_test.dart
+++ b/test/over_react/component_declaration/builder_integration_tests/new_boilerplate/accessor_mixin_integration_test.dart
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+// ignore_for_file: deprecated_member_use_from_same_package
 import 'package:over_react/over_react.dart';
 import 'package:test/test.dart';
 
diff --git a/test/over_react/component_declaration/flux_component_test/component2/basic.dart b/test/over_react/component_declaration/flux_component_test/component2/basic.dart
index 7016ea838..999ab4913 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/basic.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/basic.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/handler_lifecycle.dart b/test/over_react/component_declaration/flux_component_test/component2/handler_lifecycle.dart
index 86033b742..0ea7ecdb4 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/handler_lifecycle.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/handler_lifecycle.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/handler_precedence.dart b/test/over_react/component_declaration/flux_component_test/component2/handler_precedence.dart
index d64a82f24..ce063d7a0 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/handler_precedence.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/handler_precedence.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/prop_validation.dart b/test/over_react/component_declaration/flux_component_test/component2/prop_validation.dart
index e69408120..76dd44dd5 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/prop_validation.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/prop_validation.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/redraw_on.dart b/test/over_react/component_declaration/flux_component_test/component2/redraw_on.dart
index cda922fd9..6f3473c60 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/redraw_on.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/redraw_on.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/stateful/basic.dart b/test/over_react/component_declaration/flux_component_test/component2/stateful/basic.dart
index 012047383..03e271186 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/stateful/basic.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/stateful/basic.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/stateful/handler_lifecycle.dart b/test/over_react/component_declaration/flux_component_test/component2/stateful/handler_lifecycle.dart
index 730029e08..13fc3ed6d 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/stateful/handler_lifecycle.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/stateful/handler_lifecycle.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/stateful/handler_precedence.dart b/test/over_react/component_declaration/flux_component_test/component2/stateful/handler_precedence.dart
index 77c99681e..6b3e31dea 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/stateful/handler_precedence.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/stateful/handler_precedence.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/stateful/prop_validation.dart b/test/over_react/component_declaration/flux_component_test/component2/stateful/prop_validation.dart
index 6cfd79c21..097ee74c6 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/stateful/prop_validation.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/stateful/prop_validation.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/stateful/redraw_on.dart b/test/over_react/component_declaration/flux_component_test/component2/stateful/redraw_on.dart
index 9dd2ec5ee..04b11795c 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/stateful/redraw_on.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/stateful/redraw_on.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/stateful/store_handlers.dart b/test/over_react/component_declaration/flux_component_test/component2/stateful/store_handlers.dart
index 94e6f24a3..4dc2e44d4 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/stateful/store_handlers.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/stateful/store_handlers.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/component_declaration/flux_component_test/component2/store_handlers.dart b/test/over_react/component_declaration/flux_component_test/component2/store_handlers.dart
index 141a96d06..9da732444 100644
--- a/test/over_react/component_declaration/flux_component_test/component2/store_handlers.dart
+++ b/test/over_react/component_declaration/flux_component_test/component2/store_handlers.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 part of over_react.component_declaration.component2.flux_component_test;
 
 @Factory()
diff --git a/test/over_react/util/safe_render_manager/safe_render_manager_helper_test.dart b/test/over_react/util/safe_render_manager/safe_render_manager_helper_test.dart
index d735d4397..66c9a3d18 100644
--- a/test/over_react/util/safe_render_manager/safe_render_manager_helper_test.dart
+++ b/test/over_react/util/safe_render_manager/safe_render_manager_helper_test.dart
@@ -24,7 +24,6 @@ import 'package:test/test.dart';
 
 /// Main entry point for SafeRenderManagerHelper testing
 main() {
-  setClientConfiguration();
   enableTestMode();
 
   group('SafeRenderManagerHelper component', () {
diff --git a/test/over_react/util/shared_type_tester.dart b/test/over_react/util/shared_type_tester.dart
index fcca76bd5..df936a7e5 100644
--- a/test/over_react/util/shared_type_tester.dart
+++ b/test/over_react/util/shared_type_tester.dart
@@ -67,9 +67,9 @@ void sharedTypeTests(
       });
       if (!skipNumTypes) {
         test('num types', () {
-          final intValue = (1 as int); // ignore: unnecessary_cast
+          const intValue = (1 as int); // ignore: unnecessary_cast
           const doubleValue = 1.1;
-          final numValue = (1 as num); // ignore: unnecessary_cast
+          const numValue = (1 as num); // ignore: unnecessary_cast
 
           testTypeValue(intValue);
           testTypeValue(doubleValue);
diff --git a/test/over_react_component_declaration_test.dart b/test/over_react_component_declaration_test.dart
index 7c1cfa635..617a3fbdb 100644
--- a/test/over_react_component_declaration_test.dart
+++ b/test/over_react_component_declaration_test.dart
@@ -20,7 +20,6 @@
 library over_react_test;
 
 import 'package:over_react/over_react.dart';
-import 'package:react/react_client.dart';
 import 'package:test/test.dart';
 
 import 'over_react/component_declaration/component_base_test.dart' as component_base_test;
@@ -79,8 +78,6 @@ import 'over_react/component_declaration/builder_integration_tests/new_boilerpla
 import 'over_react/component_declaration/builder_integration_tests/new_boilerplate/unassigned_prop_integration_test.dart' as new_boilerplate_unassigned_prop_integration_test;
 
 main() {
-  setClientConfiguration();
-
   enableTestMode();
 
   component_base_test.main();
diff --git a/test/over_react_dom_test.dart b/test/over_react_dom_test.dart
index 57cd271c5..b693a957d 100644
--- a/test/over_react_dom_test.dart
+++ b/test/over_react_dom_test.dart
@@ -26,8 +26,6 @@ import 'over_react/dom/render_test.dart' as render_test;
 import 'over_react/dom/unmount_test.dart' as unmount_test;
 
 void main() {
-  setClientConfiguration();
-
   enableTestMode();
 
   render_test.main();
diff --git a/test/over_react_redux/fixtures/flux_counter.dart b/test/over_react_redux/fixtures/flux_counter.dart
index 76a37f37c..e3dbd2e6a 100644
--- a/test/over_react_redux/fixtures/flux_counter.dart
+++ b/test/over_react_redux/fixtures/flux_counter.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 import 'package:over_react/over_react.dart';
 
 import 'connect_flux_store.dart';
diff --git a/test/over_react_redux/redux_multi_provider_test.dart b/test/over_react_redux/redux_multi_provider_test.dart
index 939a5a59c..7dbc35ad0 100644
--- a/test/over_react_redux/redux_multi_provider_test.dart
+++ b/test/over_react_redux/redux_multi_provider_test.dart
@@ -19,7 +19,6 @@ import 'package:test/test.dart';
 import '../test_util/test_util.dart';
 import 'fixtures/connect_flux_counter.dart';
 import 'fixtures/connect_flux_store.dart';
-import 'fixtures/redux_actions.dart';
 
 main() {
   Context context1;
diff --git a/test/over_react_redux_test.dart b/test/over_react_redux_test.dart
index 112b44498..d805daa0f 100644
--- a/test/over_react_redux_test.dart
+++ b/test/over_react_redux_test.dart
@@ -20,7 +20,6 @@
 library over_react_component_test;
 
 import 'package:over_react/over_react.dart';
-import 'package:react/react_client.dart';
 import 'package:test/test.dart';
 
 import './over_react_redux/connect_test.dart' as connect_test;
@@ -31,8 +30,6 @@ import './over_react_redux/value_mutation_checker_test.dart' as value_mutation_c
 
 
 void main() {
-  setClientConfiguration();
-
   enableTestMode();
   connect_test.main();
   connect_flux_test.main();
diff --git a/test/over_react_util_test.dart b/test/over_react_util_test.dart
index 383f83638..2c816d090 100644
--- a/test/over_react_util_test.dart
+++ b/test/over_react_util_test.dart
@@ -20,7 +20,6 @@
 library util_test;
 
 import 'package:over_react/over_react.dart';
-import 'package:react/react_client.dart';
 import 'package:test/test.dart';
 
 import 'over_react/util/class_names_test.dart' as class_names_test;
@@ -44,8 +43,6 @@ import 'over_react/util/string_util_test.dart' as string_util_test;
 import 'over_react/util/test_mode_test.dart' as test_mode_test;
 
 void main() {
-  setClientConfiguration();
-
   enableTestMode();
 
   class_names_test.main();
diff --git a/test/vm_tests/builder/declaration_parsing_test.dart b/test/vm_tests/builder/declaration_parsing_test.dart
index 35b199f0d..23a5482ba 100644
--- a/test/vm_tests/builder/declaration_parsing_test.dart
+++ b/test/vm_tests/builder/declaration_parsing_test.dart
@@ -61,7 +61,7 @@ main() {
 
         for (var type in types) {
           test(type, () => expect(mightContainDeclarations(type), isTrue));
-        };
+        }
       });
 
       test('returns true when there is an over_react part file', () {
diff --git a/web/component1/index.dart b/web/component1/index.dart
index 77b2735af..8358e4232 100644
--- a/web/component1/index.dart
+++ b/web/component1/index.dart
@@ -14,15 +14,12 @@
 
 import 'dart:html';
 
-import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
 import 'package:over_react/react_dom.dart' as react_dom;
 
 import 'src/demos.dart';
 
 void main() {
-  setClientConfiguration();
-
   react_dom.render(
     v2.ErrorBoundary()(buttonExamplesDemo()), querySelector('$demoMountNodeSelectorPrefix--button'));
 
diff --git a/web/component1/src/demo_components/button.dart b/web/component1/src/demo_components/button.dart
index 777b25e18..40fd2c88b 100644
--- a/web/component1/src/demo_components/button.dart
+++ b/web/component1/src/demo_components/button.dart
@@ -66,7 +66,7 @@ class _$ButtonProps extends UiProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.href]_
+  /// _Proxies [DomPropsMixin.href]_
   @Accessor(keyNamespace: '')
   String href;
 
@@ -74,7 +74,7 @@ class _$ButtonProps extends UiProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.target]_
+  /// _Proxies [DomPropsMixin.target]_
   @Accessor(keyNamespace: '')
   String target;
 
@@ -83,7 +83,7 @@ class _$ButtonProps extends UiProps {
   ///
   /// This will only be applied if [href] is not set.
   ///
-  /// _Proxies [DomProps.type]_
+  /// _Proxies [DomPropsMixin.type]_
   ///
   /// Default: [ButtonType.BUTTON]
   ButtonType type;
diff --git a/web/component1/src/demo_components/button.over_react.g.dart b/web/component1/src/demo_components/button.over_react.g.dart
index c9c7e4595..514814070 100644
--- a/web/component1/src/demo_components/button.over_react.g.dart
+++ b/web/component1/src/demo_components/button.over_react.g.dart
@@ -132,7 +132,7 @@ abstract class _$ButtonPropsAccessorsMixin implements _$ButtonProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.href]_
+  /// _Proxies [DomPropsMixin.href]_
   ///
   /// <!-- Generated from [_$ButtonProps.href] -->
   @override
@@ -144,7 +144,7 @@ abstract class _$ButtonPropsAccessorsMixin implements _$ButtonProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.href]_
+  /// _Proxies [DomPropsMixin.href]_
   ///
   /// <!-- Generated from [_$ButtonProps.href] -->
   @override
@@ -155,7 +155,7 @@ abstract class _$ButtonPropsAccessorsMixin implements _$ButtonProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.target]_
+  /// _Proxies [DomPropsMixin.target]_
   ///
   /// <!-- Generated from [_$ButtonProps.target] -->
   @override
@@ -167,7 +167,7 @@ abstract class _$ButtonPropsAccessorsMixin implements _$ButtonProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.target]_
+  /// _Proxies [DomPropsMixin.target]_
   ///
   /// <!-- Generated from [_$ButtonProps.target] -->
   @override
@@ -179,7 +179,7 @@ abstract class _$ButtonPropsAccessorsMixin implements _$ButtonProps {
   ///
   /// This will only be applied if [href] is not set.
   ///
-  /// _Proxies [DomProps.type]_
+  /// _Proxies [DomPropsMixin.type]_
   ///
   /// Default: [ButtonType.BUTTON]
   ///
@@ -193,7 +193,7 @@ abstract class _$ButtonPropsAccessorsMixin implements _$ButtonProps {
   ///
   /// This will only be applied if [href] is not set.
   ///
-  /// _Proxies [DomProps.type]_
+  /// _Proxies [DomPropsMixin.type]_
   ///
   /// Default: [ButtonType.BUTTON]
   ///
diff --git a/web/component1/src/demo_components/list_group_item.dart b/web/component1/src/demo_components/list_group_item.dart
index c12792425..8aa60b793 100644
--- a/web/component1/src/demo_components/list_group_item.dart
+++ b/web/component1/src/demo_components/list_group_item.dart
@@ -77,7 +77,7 @@ class _$ListGroupItemProps extends UiProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.href]_
+  /// _Proxies [DomPropsMixin.href]_
   @Accessor(keyNamespace: '')
   String href;
 
@@ -85,7 +85,7 @@ class _$ListGroupItemProps extends UiProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.target]_
+  /// _Proxies [DomPropsMixin.target]_
   @Accessor(keyNamespace: '')
   String target;
 
@@ -94,7 +94,7 @@ class _$ListGroupItemProps extends UiProps {
   ///
   /// This will only be applied if [onClick] is also set.
   ///
-  /// _Proxies [DomProps.type]_
+  /// _Proxies [DomPropsMixin.type]_
   ///
   /// Default: [ButtonType.BUTTON]
   ButtonType type;
@@ -216,23 +216,23 @@ class ListGroupItemElementType {
 
   /// A [Dom.li] (HTML `<li>` element)
   ///
-  /// Will only be used if [ListGroupItemProps.href] and
-  /// [ListGroupItemProps.onClick] are both `null`.
+  /// Will only be used if `ListGroupItemProps.href` and
+  /// `ListGroupItemProps.onClick` are both `null`.
   ///
   /// Only use this when the parent [ListGroup] has
-  /// [ListGroupProps.elementType] set to [ListGroupElementType.UL].
+  /// `ListGroupProps.elementType` set to [ListGroupElementType.UL].
   static final ListGroupItemElementType LI =
       ListGroupItemElementType._internal(Dom.li);
 
   /// A [Dom.span] (HTML `<span>` element)
   ///
-  /// Will only be used if [ListGroupItemProps.href] and
-  /// [ListGroupItemProps.onClick] are both `null`.
+  /// Will only be used if `ListGroupItemProps.href` and
+  /// `ListGroupItemProps.onClick` are both `null`.
   static final ListGroupItemElementType SPAN =
       ListGroupItemElementType._internal(Dom.span);
 }
 
-/// Options for the [Element] that will be used when rendering a [ListGroupItemProps.header].
+/// Options for the [Element] that will be used when rendering a `ListGroupItemProps.header`.
 class ListGroupItemHeaderElementSize {
   final BuilderOnlyUiFactory<DomProps> componentBuilderFactory;
   ListGroupItemHeaderElementSize._internal(this.componentBuilderFactory);
diff --git a/web/component1/src/demo_components/list_group_item.over_react.g.dart b/web/component1/src/demo_components/list_group_item.over_react.g.dart
index ba940147d..a3f697de2 100644
--- a/web/component1/src/demo_components/list_group_item.over_react.g.dart
+++ b/web/component1/src/demo_components/list_group_item.over_react.g.dart
@@ -172,7 +172,7 @@ abstract class _$ListGroupItemPropsAccessorsMixin
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.href]_
+  /// _Proxies [DomPropsMixin.href]_
   ///
   /// <!-- Generated from [_$ListGroupItemProps.href] -->
   @override
@@ -184,7 +184,7 @@ abstract class _$ListGroupItemPropsAccessorsMixin
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.href]_
+  /// _Proxies [DomPropsMixin.href]_
   ///
   /// <!-- Generated from [_$ListGroupItemProps.href] -->
   @override
@@ -195,7 +195,7 @@ abstract class _$ListGroupItemPropsAccessorsMixin
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.target]_
+  /// _Proxies [DomPropsMixin.target]_
   ///
   /// <!-- Generated from [_$ListGroupItemProps.target] -->
   @override
@@ -207,7 +207,7 @@ abstract class _$ListGroupItemPropsAccessorsMixin
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.target]_
+  /// _Proxies [DomPropsMixin.target]_
   ///
   /// <!-- Generated from [_$ListGroupItemProps.target] -->
   @override
@@ -220,7 +220,7 @@ abstract class _$ListGroupItemPropsAccessorsMixin
   ///
   /// This will only be applied if [onClick] is also set.
   ///
-  /// _Proxies [DomProps.type]_
+  /// _Proxies [DomPropsMixin.type]_
   ///
   /// Default: [ButtonType.BUTTON]
   ///
@@ -234,7 +234,7 @@ abstract class _$ListGroupItemPropsAccessorsMixin
   ///
   /// This will only be applied if [onClick] is also set.
   ///
-  /// _Proxies [DomProps.type]_
+  /// _Proxies [DomPropsMixin.type]_
   ///
   /// Default: [ButtonType.BUTTON]
   ///
diff --git a/web/component1/src/demo_components/progress.dart b/web/component1/src/demo_components/progress.dart
index 28ad7e407..63dddcc2b 100644
--- a/web/component1/src/demo_components/progress.dart
+++ b/web/component1/src/demo_components/progress.dart
@@ -89,7 +89,7 @@ class _$ProgressProps extends UiProps {
 
 @State()
 class _$ProgressState extends UiState {
-  /// An autogenerated GUID, used as a fallback when [ProgressProps.id] is unspecified, and
+  /// An autogenerated GUID, used as a fallback when `ProgressProps.id` is unspecified, and
   /// saved on the state so it will persist across remounts.
   ///
   /// HTML id attributes are needed on `<progress>` elements for proper accessibility support,
@@ -163,7 +163,7 @@ class ProgressComponent extends UiStatefulComponent<ProgressProps, ProgressState
       ..add(props.skin.className);
   }
 
-  /// Get the percentage complete based on [ProgressProps.min], [ProgressProps.max] and [ProgressProps.value].
+  /// Get the percentage complete based on `ProgressProps.min`, `ProgressProps.max` and `ProgressProps.value`.
   double _getPercentComplete() {
     return (props.value - props.min) / (props.max - props.min) * 100;
   }
@@ -172,7 +172,7 @@ class ProgressComponent extends UiStatefulComponent<ProgressProps, ProgressState
   /// within the rendered [Progress] component via [DomPropsMixin.value].
   ///
   /// Note that the value of the HTML `<progress>` element's value
-  /// attribute will never be less than the value of [ProgressProps.min].
+  /// attribute will never be less than the value of `ProgressProps.min`.
   double get currentValue => max(props.min, props.value);
 
   String get id => props.id ?? state.id;
diff --git a/web/component1/src/demo_components/progress.over_react.g.dart b/web/component1/src/demo_components/progress.over_react.g.dart
index 874bf7246..2e2f69ad8 100644
--- a/web/component1/src/demo_components/progress.over_react.g.dart
+++ b/web/component1/src/demo_components/progress.over_react.g.dart
@@ -338,7 +338,7 @@ abstract class _$ProgressStateAccessorsMixin implements _$ProgressState {
   @override
   Map get state;
 
-  /// An autogenerated GUID, used as a fallback when [ProgressProps.id] is unspecified, and
+  /// An autogenerated GUID, used as a fallback when `ProgressProps.id` is unspecified, and
   /// saved on the state so it will persist across remounts.
   ///
   /// HTML id attributes are needed on `<progress>` elements for proper accessibility support,
@@ -349,7 +349,7 @@ abstract class _$ProgressStateAccessorsMixin implements _$ProgressState {
   String get id =>
       state[_$key__id___$ProgressState] ??
       null; // Add ` ?? null` to workaround DDC bug: <https://github.com/dart-lang/sdk/issues/36052>;
-  /// An autogenerated GUID, used as a fallback when [ProgressProps.id] is unspecified, and
+  /// An autogenerated GUID, used as a fallback when `ProgressProps.id` is unspecified, and
   /// saved on the state so it will persist across remounts.
   ///
   /// HTML id attributes are needed on `<progress>` elements for proper accessibility support,
diff --git a/web/component1/src/demo_components/toggle_button.dart b/web/component1/src/demo_components/toggle_button.dart
index bab4e9974..2abf948fd 100644
--- a/web/component1/src/demo_components/toggle_button.dart
+++ b/web/component1/src/demo_components/toggle_button.dart
@@ -32,7 +32,7 @@ class _$ToggleButtonProps extends ButtonProps with
     AbstractInputPropsMixin {
   /// Whether the `<input>` rendered by the [ToggleButton] should have focus upon mounting.
   ///
-  /// _Proxies [DomProps.autoFocus]._
+  /// _Proxies [DomPropsMixin.autoFocus]._
   ///
   /// Default: `false`
   @Accessor(keyNamespace: '')
@@ -47,7 +47,7 @@ class _$ToggleButtonProps extends ButtonProps with
   ///
   /// Related: [checked]
   ///
-  /// _Proxies [DomProps.defaultChecked]._
+  /// _Proxies [DomPropsMixin.defaultChecked]._
   ///
   /// See: <https://facebook.github.io/react/docs/forms.html#uncontrolled-components>.
   @Accessor(keyNamespace: '')
@@ -61,7 +61,7 @@ class _$ToggleButtonProps extends ButtonProps with
   ///
   /// Related: [defaultChecked]
   ///
-  /// _Proxies [DomProps.checked]._
+  /// _Proxies [DomPropsMixin.checked]._
   ///
   /// See: <https://facebook.github.io/react/docs/forms.html#controlled-components>.
   @Accessor(keyNamespace: '')
@@ -74,12 +74,12 @@ class _$ToggleButtonState extends ButtonState with
   /// Tracks if the [ToggleButton] is focused. Determines whether to render with the `js-focus` CSS
   /// class.
   ///
-  /// Initial: [ToggleButtonProps.autoFocus]
+  /// Initial: `ToggleButtonProps.autoFocus`
   bool isFocused;
 
   /// Tracks if the [ToggleButton] input is `checked`. Determines whether to render with the `active` CSS class.
   ///
-  /// Initial: [ToggleButtonProps.checked] `??` [ToggleButtonProps.defaultChecked] `?? false`
+  /// Initial: `ToggleButtonProps.checked ?? ToggleButtonProps.defaultChecked ?? false`
   bool isChecked;
 }
 
@@ -195,10 +195,10 @@ class ToggleButtonComponent extends ButtonComponent<ToggleButtonProps, ToggleBut
     'pointerEvents': 'none'
   };
 
-  /// Checks the `<input>` element to ensure that [ToggleButtonState.isChecked]
+  /// Checks the `<input>` element to ensure that `ToggleButtonState.isChecked`
   /// matches the value of the [InputElement.checked] attribute.
   ///
-  /// Does not refresh the state if [ToggleButtonProps.checked] is not null
+  /// Does not refresh the state if `ToggleButtonProps.checked` is not null
   /// (the component is a "controlled" component).
   void refreshState() {
     if (!_isControlled) setState(newState()..isChecked = inputRef.checked);
diff --git a/web/component1/src/demo_components/toggle_button.over_react.g.dart b/web/component1/src/demo_components/toggle_button.over_react.g.dart
index 8ff28406f..aa6e96b60 100644
--- a/web/component1/src/demo_components/toggle_button.over_react.g.dart
+++ b/web/component1/src/demo_components/toggle_button.over_react.g.dart
@@ -27,7 +27,7 @@ abstract class _$ToggleButtonPropsAccessorsMixin
 
   /// Whether the `<input>` rendered by the [ToggleButton] should have focus upon mounting.
   ///
-  /// _Proxies [DomProps.autoFocus]._
+  /// _Proxies [DomPropsMixin.autoFocus]._
   ///
   /// Default: `false`
   ///
@@ -39,7 +39,7 @@ abstract class _$ToggleButtonPropsAccessorsMixin
       null; // Add ` ?? null` to workaround DDC bug: <https://github.com/dart-lang/sdk/issues/36052>;
   /// Whether the `<input>` rendered by the [ToggleButton] should have focus upon mounting.
   ///
-  /// _Proxies [DomProps.autoFocus]._
+  /// _Proxies [DomPropsMixin.autoFocus]._
   ///
   /// Default: `false`
   ///
@@ -58,7 +58,7 @@ abstract class _$ToggleButtonPropsAccessorsMixin
   ///
   /// Related: [checked]
   ///
-  /// _Proxies [DomProps.defaultChecked]._
+  /// _Proxies [DomPropsMixin.defaultChecked]._
   ///
   /// See: <https://facebook.github.io/react/docs/forms.html#uncontrolled-components>.
   ///
@@ -77,7 +77,7 @@ abstract class _$ToggleButtonPropsAccessorsMixin
   ///
   /// Related: [checked]
   ///
-  /// _Proxies [DomProps.defaultChecked]._
+  /// _Proxies [DomPropsMixin.defaultChecked]._
   ///
   /// See: <https://facebook.github.io/react/docs/forms.html#uncontrolled-components>.
   ///
@@ -95,7 +95,7 @@ abstract class _$ToggleButtonPropsAccessorsMixin
   ///
   /// Related: [defaultChecked]
   ///
-  /// _Proxies [DomProps.checked]._
+  /// _Proxies [DomPropsMixin.checked]._
   ///
   /// See: <https://facebook.github.io/react/docs/forms.html#controlled-components>.
   ///
@@ -113,7 +113,7 @@ abstract class _$ToggleButtonPropsAccessorsMixin
   ///
   /// Related: [defaultChecked]
   ///
-  /// _Proxies [DomProps.checked]._
+  /// _Proxies [DomPropsMixin.checked]._
   ///
   /// See: <https://facebook.github.io/react/docs/forms.html#controlled-components>.
   ///
@@ -197,7 +197,7 @@ abstract class _$ToggleButtonStateAccessorsMixin
   /// Tracks if the [ToggleButton] is focused. Determines whether to render with the `js-focus` CSS
   /// class.
   ///
-  /// Initial: [ToggleButtonProps.autoFocus]
+  /// Initial: `ToggleButtonProps.autoFocus`
   ///
   /// <!-- Generated from [_$ToggleButtonState.isFocused] -->
   @override
@@ -207,7 +207,7 @@ abstract class _$ToggleButtonStateAccessorsMixin
   /// Tracks if the [ToggleButton] is focused. Determines whether to render with the `js-focus` CSS
   /// class.
   ///
-  /// Initial: [ToggleButtonProps.autoFocus]
+  /// Initial: `ToggleButtonProps.autoFocus`
   ///
   /// <!-- Generated from [_$ToggleButtonState.isFocused] -->
   @override
@@ -216,7 +216,7 @@ abstract class _$ToggleButtonStateAccessorsMixin
 
   /// Tracks if the [ToggleButton] input is `checked`. Determines whether to render with the `active` CSS class.
   ///
-  /// Initial: [ToggleButtonProps.checked] `??` [ToggleButtonProps.defaultChecked] `?? false`
+  /// Initial: `ToggleButtonProps.checked ?? ToggleButtonProps.defaultChecked ?? false`
   ///
   /// <!-- Generated from [_$ToggleButtonState.isChecked] -->
   @override
@@ -225,7 +225,7 @@ abstract class _$ToggleButtonStateAccessorsMixin
       null; // Add ` ?? null` to workaround DDC bug: <https://github.com/dart-lang/sdk/issues/36052>;
   /// Tracks if the [ToggleButton] input is `checked`. Determines whether to render with the `active` CSS class.
   ///
-  /// Initial: [ToggleButtonProps.checked] `??` [ToggleButtonProps.defaultChecked] `?? false`
+  /// Initial: `ToggleButtonProps.checked ?? ToggleButtonProps.defaultChecked ?? false`
   ///
   /// <!-- Generated from [_$ToggleButtonState.isChecked] -->
   @override
diff --git a/web/component1/src/demo_components/toggle_button_group.dart b/web/component1/src/demo_components/toggle_button_group.dart
index 5e57ebedb..f119ba65a 100644
--- a/web/component1/src/demo_components/toggle_button_group.dart
+++ b/web/component1/src/demo_components/toggle_button_group.dart
@@ -19,7 +19,7 @@ import '../demo_components.dart';
 part 'toggle_button_group.over_react.g.dart';
 
 /// A specialized [ButtonGroup] component that will surround one or more child
-/// [ToggleButton] components so that a single shared [ToggleButtonGroupProps.name]
+/// [ToggleButton] components so that a single shared `ToggleButtonGroupProps.name`
 /// value can be applied to the aforementioned children via [cloneElement].
 ///
 /// __Renders HTML Markup:__
@@ -55,8 +55,8 @@ class ToggleButtonGroupComponent extends ButtonGroupComponent<ToggleButtonGroupP
 
   /// The name to use for all children of a [ToggleButtonGroup].
   ///
-  /// Attempts to use [ToggleButtonGroupProps.name] _(specified by the consumer)_, falling back to
-  /// [ToggleButtonGroupState.name] _(auto-generated)_.
+  /// Attempts to use `ToggleButtonGroupProps.name` _(specified by the consumer)_, falling back to
+  /// `ToggleButtonGroupState.name` _(auto-generated)_.
   String get name => props.name ?? state.name;
 
   @override
diff --git a/web/component1/src/demos/button/index.dart b/web/component1/src/demos/button/index.dart
index 397f5bdb8..fb281d2f7 100644
--- a/web/component1/src/demos/button/index.dart
+++ b/web/component1/src/demos/button/index.dart
@@ -15,13 +15,10 @@
 import 'dart:html';
 
 import 'package:over_react/react_dom.dart' as react_dom;
-import 'package:over_react/over_react.dart';
 
 import '../../demos.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(buttonExamplesDemo(),
       querySelector('$demoMountNodeSelectorPrefix--button-examples'));
 
diff --git a/web/component1/src/demos/list-group/index.dart b/web/component1/src/demos/list-group/index.dart
index f295adf5d..e1155f5df 100644
--- a/web/component1/src/demos/list-group/index.dart
+++ b/web/component1/src/demos/list-group/index.dart
@@ -15,13 +15,10 @@
 import 'dart:html';
 
 import 'package:over_react/react_dom.dart' as react_dom;
-import 'package:over_react/over_react.dart';
 
 import '../../demos.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(listGroupBasicDemo(),
       querySelector('$demoMountNodeSelectorPrefix--list-group-basic'));
 
diff --git a/web/component1/src/demos/progress/index.dart b/web/component1/src/demos/progress/index.dart
index 65045cc27..4e6c1a929 100644
--- a/web/component1/src/demos/progress/index.dart
+++ b/web/component1/src/demos/progress/index.dart
@@ -15,13 +15,10 @@
 import 'dart:html';
 
 import 'package:over_react/react_dom.dart' as react_dom;
-import 'package:over_react/over_react.dart';
 
 import '../../demos.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(progressBasicDemo(),
       querySelector('$demoMountNodeSelectorPrefix--progress-basic'));
 
diff --git a/web/component1/src/demos/tag/index.dart b/web/component1/src/demos/tag/index.dart
index 7fdfd0ad2..c2e434860 100644
--- a/web/component1/src/demos/tag/index.dart
+++ b/web/component1/src/demos/tag/index.dart
@@ -15,13 +15,10 @@
 import 'dart:html';
 
 import 'package:over_react/react_dom.dart' as react_dom;
-import 'package:over_react/over_react.dart';
 
 import '../../demos.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(tagBasicDemo(), querySelector('$demoMountNodeSelectorPrefix--tag-basic'));
 
   react_dom.render(tagContextualDemo(), querySelector('$demoMountNodeSelectorPrefix--tag-contextual'));
diff --git a/web/component1/src/shared/constants.dart b/web/component1/src/shared/constants.dart
index 447e4f32f..b6d81f538 100644
--- a/web/component1/src/shared/constants.dart
+++ b/web/component1/src/shared/constants.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: deprecated_member_use_from_same_package
 import 'package:over_react/over_react.dart';
 part 'constants.over_react.g.dart';
 
@@ -63,14 +64,14 @@ abstract class _$AbstractInputPropsMixin {
   ///
   /// If unspecified, [AbstractInputStateMixin.id] will be generated.
   ///
-  /// _Proxies [DomProps.id]._
+  /// _Proxies [DomPropsMixin.id]._
   String get id;
 
   /// The HTML `name` attribute to be applied to `<input>`.
   ///
   /// If unspecified, [AbstractInputStateMixin.name] will be generated.
   ///
-  /// _Proxies [DomProps.name]._
+  /// _Proxies [DomPropsMixin.name]._
   @Accessor(keyNamespace: '')
   String name;
 
@@ -79,7 +80,7 @@ abstract class _$AbstractInputPropsMixin {
   ///
   /// See: [React Controlled Components](https://facebook.github.io/react/docs/forms.html#controlled-components)
   ///
-  /// _Proxies [DomProps.value]._
+  /// _Proxies [DomPropsMixin.value]._
   @Accessor(keyNamespace: '')
   dynamic value;
 
diff --git a/web/component1/src/shared/constants.over_react.g.dart b/web/component1/src/shared/constants.over_react.g.dart
index d6c2d00db..1aab35cd3 100644
--- a/web/component1/src/shared/constants.over_react.g.dart
+++ b/web/component1/src/shared/constants.over_react.g.dart
@@ -19,7 +19,7 @@ abstract class AbstractInputPropsMixin implements _$AbstractInputPropsMixin {
   ///
   /// If unspecified, [AbstractInputStateMixin.name] will be generated.
   ///
-  /// _Proxies [DomProps.name]._
+  /// _Proxies [DomPropsMixin.name]._
   ///
   /// <!-- Generated from [_$AbstractInputPropsMixin.name] -->
   @override
@@ -31,7 +31,7 @@ abstract class AbstractInputPropsMixin implements _$AbstractInputPropsMixin {
   ///
   /// If unspecified, [AbstractInputStateMixin.name] will be generated.
   ///
-  /// _Proxies [DomProps.name]._
+  /// _Proxies [DomPropsMixin.name]._
   ///
   /// <!-- Generated from [_$AbstractInputPropsMixin.name] -->
   @override
@@ -44,7 +44,7 @@ abstract class AbstractInputPropsMixin implements _$AbstractInputPropsMixin {
   ///
   /// See: [React Controlled Components](https://facebook.github.io/react/docs/forms.html#controlled-components)
   ///
-  /// _Proxies [DomProps.value]._
+  /// _Proxies [DomPropsMixin.value]._
   ///
   /// <!-- Generated from [_$AbstractInputPropsMixin.value] -->
   @override
@@ -57,7 +57,7 @@ abstract class AbstractInputPropsMixin implements _$AbstractInputPropsMixin {
   ///
   /// See: [React Controlled Components](https://facebook.github.io/react/docs/forms.html#controlled-components)
   ///
-  /// _Proxies [DomProps.value]._
+  /// _Proxies [DomPropsMixin.value]._
   ///
   /// <!-- Generated from [_$AbstractInputPropsMixin.value] -->
   @override
diff --git a/web/component2/index.dart b/web/component2/index.dart
index 2ee42ccd4..30afa9354 100644
--- a/web/component2/index.dart
+++ b/web/component2/index.dart
@@ -21,8 +21,6 @@ import 'package:over_react/react_dom.dart' as react_dom;
 import 'src/demos.dart';
 
 void main() {
-  setClientConfiguration();
-
   react_dom.render(
     buttonExamplesDemo(), querySelector('$demoMountNodeSelectorPrefix--button'));
 
diff --git a/web/component2/src/demo_components/button.dart b/web/component2/src/demo_components/button.dart
index 9ddc07cea..cb4156c55 100644
--- a/web/component2/src/demo_components/button.dart
+++ b/web/component2/src/demo_components/button.dart
@@ -64,7 +64,7 @@ mixin ButtonProps on UiProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.href]_
+  /// _Proxies [DomPropsMixin.href]_
   @Accessor(keyNamespace: '')
   String href;
 
@@ -72,7 +72,7 @@ mixin ButtonProps on UiProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.target]_
+  /// _Proxies [DomPropsMixin.target]_
   @Accessor(keyNamespace: '')
   String target;
 
@@ -81,7 +81,7 @@ mixin ButtonProps on UiProps {
   ///
   /// This will only be applied if [href] is not set.
   ///
-  /// _Proxies [DomProps.type]_
+  /// _Proxies [DomPropsMixin.type]_
   ///
   /// Default: [ButtonType.BUTTON]
   ButtonType type;
diff --git a/web/component2/src/demo_components/list_group_item.dart b/web/component2/src/demo_components/list_group_item.dart
index 2ec55fa8c..a6aa069c6 100644
--- a/web/component2/src/demo_components/list_group_item.dart
+++ b/web/component2/src/demo_components/list_group_item.dart
@@ -73,7 +73,7 @@ mixin ListGroupItemProps on UiProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.href]_
+  /// _Proxies [DomPropsMixin.href]_
   @Accessor(keyNamespace: '')
   String href;
 
@@ -81,7 +81,7 @@ mixin ListGroupItemProps on UiProps {
   ///
   /// If set, the item will render via [Dom.a].
   ///
-  /// _Proxies [DomProps.target]_
+  /// _Proxies [DomPropsMixin.target]_
   @Accessor(keyNamespace: '')
   String target;
 
@@ -90,7 +90,7 @@ mixin ListGroupItemProps on UiProps {
   ///
   /// This will only be applied if [onClick] is also set.
   ///
-  /// _Proxies [DomProps.type]_
+  /// _Proxies [DomPropsMixin.type]_
   ///
   /// Default: [ButtonType.BUTTON]
   ButtonType type;
@@ -212,7 +212,7 @@ class ListGroupItemElementType {
   /// A [Dom.li] (HTML `<li>` element)
   ///
   /// Will only be used if [ListGroupItemProps.href] and
-  /// [ListGroupItemProps.onClick] are both `null`.
+  /// `ListGroupItemProps.onClick` are both `null`.
   ///
   /// Only use this when the parent [ListGroup] has
   /// [ListGroupProps.elementType] set to [ListGroupElementType.UL].
@@ -222,7 +222,7 @@ class ListGroupItemElementType {
   /// A [Dom.span] (HTML `<span>` element)
   ///
   /// Will only be used if [ListGroupItemProps.href] and
-  /// [ListGroupItemProps.onClick] are both `null`.
+  /// `ListGroupItemProps.onClick` are both `null`.
   static final ListGroupItemElementType SPAN =
       ListGroupItemElementType._internal(Dom.span);
 }
diff --git a/web/component2/src/demo_components/progress.dart b/web/component2/src/demo_components/progress.dart
index 62c407399..381bc3ec6 100644
--- a/web/component2/src/demo_components/progress.dart
+++ b/web/component2/src/demo_components/progress.dart
@@ -86,7 +86,7 @@ mixin ProgressProps on UiProps {
 }
 
 mixin ProgressState on UiState {
-  /// An autogenerated GUID, used as a fallback when [ProgressProps.id] is unspecified, and
+  /// An autogenerated GUID, used as a fallback when `ProgressProps.id` is unspecified, and
   /// saved on the state so it will persist across remounts.
   ///
   /// HTML id attributes are needed on `<progress>` elements for proper accessibility support,
diff --git a/web/component2/src/demo_components/toggle_button.dart b/web/component2/src/demo_components/toggle_button.dart
index 441a0abd3..7ae46565f 100644
--- a/web/component2/src/demo_components/toggle_button.dart
+++ b/web/component2/src/demo_components/toggle_button.dart
@@ -29,7 +29,7 @@ UiFactory<ToggleButtonProps> ToggleButton = _$ToggleButton;
 mixin ToggleButtonPropsMixin on UiProps {
   /// Whether the `<input>` rendered by the [ToggleButton] should have focus upon mounting.
   ///
-  /// _Proxies [DomProps.autoFocus]._
+  /// _Proxies [DomPropsMixin.autoFocus]._
   ///
   /// Default: `false`
   @Accessor(keyNamespace: '')
@@ -44,7 +44,7 @@ mixin ToggleButtonPropsMixin on UiProps {
   ///
   /// Related: [checked]
   ///
-  /// _Proxies [DomProps.defaultChecked]._
+  /// _Proxies [DomPropsMixin.defaultChecked]._
   ///
   /// See: <https://facebook.github.io/react/docs/forms.html#uncontrolled-components>.
   @Accessor(keyNamespace: '')
@@ -58,7 +58,7 @@ mixin ToggleButtonPropsMixin on UiProps {
   ///
   /// Related: [defaultChecked]
   ///
-  /// _Proxies [DomProps.checked]._
+  /// _Proxies [DomPropsMixin.checked]._
   ///
   /// See: <https://facebook.github.io/react/docs/forms.html#controlled-components>.
   @Accessor(keyNamespace: '')
@@ -71,12 +71,12 @@ mixin ToggleButtonStateMixin on UiState {
   /// Tracks if the [ToggleButton] is focused. Determines whether to render with the `js-focus` CSS
   /// class.
   ///
-  /// Initial: [ToggleButtonProps.autoFocus]
+  /// Initial: `ToggleButtonProps.autoFocus`
   bool isFocused;
 
   /// Tracks if the [ToggleButton] input is `checked`. Determines whether to render with the `active` CSS class.
   ///
-  /// Initial: [ToggleButtonProps.checked] `??` [ToggleButtonProps.defaultChecked] `?? false`
+  /// Initial: `ToggleButtonProps.checked ?? ToggleButtonProps.defaultChecked ?? false`
   bool isChecked;
 }
 
@@ -186,10 +186,10 @@ class ToggleButtonComponent extends ButtonComponent<ToggleButtonProps, ToggleBut
     'pointerEvents': 'none'
   };
 
-  /// Checks the `<input>` element to ensure that [ToggleButtonState.isChecked]
+  /// Checks the `<input>` element to ensure that `ToggleButtonState.isChecked`
   /// matches the value of the [InputElement.checked] attribute.
   ///
-  /// Does not refresh the state if [ToggleButtonProps.checked] is not null
+  /// Does not refresh the state if `ToggleButtonProps.checked` is not null
   /// (the component is a "controlled" component).
   void refreshState() {
     if (!_isControlled) setState(newState()..isChecked = inputRef.checked);
diff --git a/web/component2/src/demo_components/toggle_button_group.dart b/web/component2/src/demo_components/toggle_button_group.dart
index 671254062..cc9b4ae95 100644
--- a/web/component2/src/demo_components/toggle_button_group.dart
+++ b/web/component2/src/demo_components/toggle_button_group.dart
@@ -18,7 +18,7 @@ import '../demo_components.dart';
 part 'toggle_button_group.over_react.g.dart';
 
 /// A specialized [ButtonGroup] component that will surround one or more child
-/// [ToggleButton] components so that a single shared [ToggleButtonGroupProps.name]
+/// [ToggleButton] components so that a single shared `ToggleButtonGroupProps.name`
 /// value can be applied to the aforementioned children via [cloneElement].
 ///
 /// __Renders HTML Markup:__
@@ -51,8 +51,8 @@ class ToggleButtonGroupComponent
 
   /// The name to use for all children of a [ToggleButtonGroup].
   ///
-  /// Attempts to use [ToggleButtonGroupProps.name] _(specified by the consumer)_, falling back to
-  /// [ToggleButtonGroupState.name] _(auto-generated)_.
+  /// Attempts to use `ToggleButtonGroupProps.name` _(specified by the consumer)_, falling back to
+  /// `ToggleButtonGroupState.name` _(auto-generated)_.
   String get name => props.name ?? state.name;
 
   @override
diff --git a/web/component2/src/demos/button/index.dart b/web/component2/src/demos/button/index.dart
index 397f5bdb8..fb281d2f7 100644
--- a/web/component2/src/demos/button/index.dart
+++ b/web/component2/src/demos/button/index.dart
@@ -15,13 +15,10 @@
 import 'dart:html';
 
 import 'package:over_react/react_dom.dart' as react_dom;
-import 'package:over_react/over_react.dart';
 
 import '../../demos.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(buttonExamplesDemo(),
       querySelector('$demoMountNodeSelectorPrefix--button-examples'));
 
diff --git a/web/component2/src/demos/list-group/index.dart b/web/component2/src/demos/list-group/index.dart
index f295adf5d..e1155f5df 100644
--- a/web/component2/src/demos/list-group/index.dart
+++ b/web/component2/src/demos/list-group/index.dart
@@ -15,13 +15,10 @@
 import 'dart:html';
 
 import 'package:over_react/react_dom.dart' as react_dom;
-import 'package:over_react/over_react.dart';
 
 import '../../demos.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(listGroupBasicDemo(),
       querySelector('$demoMountNodeSelectorPrefix--list-group-basic'));
 
diff --git a/web/component2/src/demos/progress/index.dart b/web/component2/src/demos/progress/index.dart
index 65045cc27..4e6c1a929 100644
--- a/web/component2/src/demos/progress/index.dart
+++ b/web/component2/src/demos/progress/index.dart
@@ -15,13 +15,10 @@
 import 'dart:html';
 
 import 'package:over_react/react_dom.dart' as react_dom;
-import 'package:over_react/over_react.dart';
 
 import '../../demos.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(progressBasicDemo(),
       querySelector('$demoMountNodeSelectorPrefix--progress-basic'));
 
diff --git a/web/component2/src/demos/tag/index.dart b/web/component2/src/demos/tag/index.dart
index 7fdfd0ad2..c2e434860 100644
--- a/web/component2/src/demos/tag/index.dart
+++ b/web/component2/src/demos/tag/index.dart
@@ -15,13 +15,10 @@
 import 'dart:html';
 
 import 'package:over_react/react_dom.dart' as react_dom;
-import 'package:over_react/over_react.dart';
 
 import '../../demos.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(tagBasicDemo(), querySelector('$demoMountNodeSelectorPrefix--tag-basic'));
 
   react_dom.render(tagContextualDemo(), querySelector('$demoMountNodeSelectorPrefix--tag-contextual'));
diff --git a/web/component2/src/shared/constants.dart b/web/component2/src/shared/constants.dart
index 0d15651dc..d62ccb6b3 100644
--- a/web/component2/src/shared/constants.dart
+++ b/web/component2/src/shared/constants.dart
@@ -60,14 +60,15 @@ mixin AbstractInputPropsMixin on UiProps {
   ///
   /// If unspecified, [AbstractInputStateMixin.id] will be generated.
   ///
-  /// _Proxies [DomProps.id]._
+  /// _Proxies [DomPropsMixin.id]._
+  @override
   String get id;
 
   /// The HTML `name` attribute to be applied to `<input>`.
   ///
   /// If unspecified, [AbstractInputStateMixin.name] will be generated.
   ///
-  /// _Proxies [DomProps.name]._
+  /// _Proxies [DomPropsMixin.name]._
   @Accessor(keyNamespace: '')
   String name;
 
@@ -76,7 +77,7 @@ mixin AbstractInputPropsMixin on UiProps {
   ///
   /// See: [React Controlled Components](https://facebook.github.io/react/docs/forms.html#controlled-components)
   ///
-  /// _Proxies [DomProps.value]._
+  /// _Proxies [DomPropsMixin.value]._
   @Accessor(keyNamespace: '')
   dynamic value;
 
diff --git a/web/flux_to_redux/advanced/examples/flux_implementation/index.dart b/web/flux_to_redux/advanced/examples/flux_implementation/index.dart
index e2c1b55aa..d7660454c 100644
--- a/web/flux_to_redux/advanced/examples/flux_implementation/index.dart
+++ b/web/flux_to_redux/advanced/examples/flux_implementation/index.dart
@@ -14,17 +14,13 @@
 
 import 'dart:html';
 
-import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 
 import 'components/big_block.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
       v2.ErrorBoundary()(
         (BigBlock()
diff --git a/web/flux_to_redux/advanced/examples/influx_implementation/index.dart b/web/flux_to_redux/advanced/examples/influx_implementation/index.dart
index 03b56314f..9005673bd 100644
--- a/web/flux_to_redux/advanced/examples/influx_implementation/index.dart
+++ b/web/flux_to_redux/advanced/examples/influx_implementation/index.dart
@@ -14,10 +14,8 @@
 
 import 'dart:html';
 
-import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
 import 'package:over_react/over_react_flux.dart';
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 
 import './components/big_block.dart';
@@ -27,8 +25,6 @@ import 'components/should_not_update.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
       v2.ErrorBoundary()(
         // Note the use of the `ReduxMultiProvider` as opposed to a traditional
diff --git a/web/flux_to_redux/advanced/examples/redux_implementation/index.dart b/web/flux_to_redux/advanced/examples/redux_implementation/index.dart
index d753b5a4f..cdeabd977 100644
--- a/web/flux_to_redux/advanced/examples/redux_implementation/index.dart
+++ b/web/flux_to_redux/advanced/examples/redux_implementation/index.dart
@@ -14,10 +14,8 @@
 
 import 'dart:html';
 
-import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
 import 'package:over_react/over_react_flux.dart';
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 import 'package:over_react/over_react_redux.dart';
 
@@ -26,8 +24,6 @@ import './components/random_color_redux.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
       v2.ErrorBoundary()(
         (ReduxProvider()..store = reduxStore)(
diff --git a/web/flux_to_redux/simple/examples/flux_implementation/index.dart b/web/flux_to_redux/simple/examples/flux_implementation/index.dart
index 9e9114f5f..17a82c938 100644
--- a/web/flux_to_redux/simple/examples/flux_implementation/index.dart
+++ b/web/flux_to_redux/simple/examples/flux_implementation/index.dart
@@ -14,17 +14,13 @@
 
 import 'dart:html';
 
-import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 
 import './components/big_block.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
       v2.ErrorBoundary()(
         (BigBlock()
diff --git a/web/flux_to_redux/simple/examples/influx_implementation/index.dart b/web/flux_to_redux/simple/examples/influx_implementation/index.dart
index 596e64e35..fcc692acf 100644
--- a/web/flux_to_redux/simple/examples/influx_implementation/index.dart
+++ b/web/flux_to_redux/simple/examples/influx_implementation/index.dart
@@ -14,9 +14,7 @@
 
 import 'dart:html';
 
-import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 import 'package:over_react/over_react_redux.dart';
 
@@ -27,8 +25,6 @@ import './components/should_not_update.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
       v2.ErrorBoundary()(
         (ReduxProvider()..store = adaptedStore)(
diff --git a/web/flux_to_redux/simple/examples/redux_implementation/index.dart b/web/flux_to_redux/simple/examples/redux_implementation/index.dart
index e535a0464..e6eadba58 100644
--- a/web/flux_to_redux/simple/examples/redux_implementation/index.dart
+++ b/web/flux_to_redux/simple/examples/redux_implementation/index.dart
@@ -14,9 +14,7 @@
 
 import 'dart:html';
 
-import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 import 'package:over_react/over_react_redux.dart';
 
@@ -25,8 +23,6 @@ import './components/big_block.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
       v2.ErrorBoundary()(
         (ReduxProvider()..store = randomColorStore)(
diff --git a/web/over_react_redux/examples/dev_tools/index.dart b/web/over_react_redux/examples/dev_tools/index.dart
index 400f9a060..5911dea1f 100644
--- a/web/over_react_redux/examples/dev_tools/index.dart
+++ b/web/over_react_redux/examples/dev_tools/index.dart
@@ -16,7 +16,6 @@ import 'dart:html';
 
 import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 import 'package:over_react/over_react_redux.dart';
 
@@ -24,8 +23,6 @@ import './components/counter.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
     v2.ErrorBoundary()(
       (ReduxProvider()..store = store)(
diff --git a/web/over_react_redux/examples/multiple_stores/index.dart b/web/over_react_redux/examples/multiple_stores/index.dart
index 9947c4036..42252698b 100644
--- a/web/over_react_redux/examples/multiple_stores/index.dart
+++ b/web/over_react_redux/examples/multiple_stores/index.dart
@@ -16,7 +16,6 @@ import 'dart:html';
 
 import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 import 'package:over_react/over_react_redux.dart';
 
@@ -24,8 +23,6 @@ import './components/counter.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
     v2.ErrorBoundary()(
       (ReduxProvider()..store = store1)(
diff --git a/web/over_react_redux/examples/simple/index.dart b/web/over_react_redux/examples/simple/index.dart
index 010c9cb3f..274bddc4b 100644
--- a/web/over_react_redux/examples/simple/index.dart
+++ b/web/over_react_redux/examples/simple/index.dart
@@ -16,7 +16,6 @@ import 'dart:html';
 
 import 'package:over_react/over_react.dart';
 import 'package:over_react/components.dart' as v2;
-import 'package:react/react_client.dart';
 import 'package:react/react_dom.dart' as react_dom;
 import 'package:over_react/over_react_redux.dart';
 
@@ -24,8 +23,6 @@ import './components/counter.dart';
 import './store.dart';
 
 main() {
-  setClientConfiguration();
-
   react_dom.render(
     v2.ErrorBoundary()(
       (ReduxProvider()..store = store)(