diff --git a/spine-flutter/clean.sh b/spine-flutter/clean.sh
new file mode 100755
index 000000000..7f58c56f0
--- /dev/null
+++ b/spine-flutter/clean.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+set -e
+cd "$(dirname "$0")"
+
+# Source logging utilities
+source ../formatters/logging/logging.sh
+
+log_title "Spine Flutter Clean"
+
+log_detail "Cleaning all build artifacts and resetting iOS/macOS projects"
+
+# Clean Flutter build artifacts
+log_action "Cleaning Flutter build artifacts"
+if flutter clean 2>&1 >/dev/null; then
+    log_ok
+else
+    log_fail
+fi
+
+# Clean example Flutter build artifacts
+if [ -d "example" ]; then
+    log_action "Cleaning example Flutter build artifacts"
+    if (cd example && flutter clean) 2>&1 >/dev/null; then
+        log_ok
+    else
+        log_fail
+    fi
+fi
+
+# Clean iOS artifacts
+log_action "Cleaning iOS CocoaPods artifacts"
+rm -rf ios/Pods
+rm -f ios/Podfile.lock
+rm -rf ios/.symlinks
+rm -rf ios/Flutter/Flutter.framework
+rm -rf ios/Flutter/Flutter.podspec
+log_ok
+
+# Clean macOS artifacts
+log_action "Cleaning macOS CocoaPods artifacts"
+rm -rf macos/Pods
+rm -f macos/Podfile.lock
+rm -rf macos/.symlinks
+rm -rf macos/Flutter/ephemeral
+log_ok
+
+# Clean example iOS artifacts
+if [ -d "example/ios" ]; then
+    log_action "Cleaning example iOS CocoaPods artifacts"
+    rm -rf example/ios/Pods
+    rm -f example/ios/Podfile.lock
+    rm -rf example/ios/.symlinks
+    rm -rf example/ios/Flutter/Flutter.framework
+    rm -rf example/ios/Flutter/Flutter.podspec
+    log_ok
+fi
+
+# Clean example macOS artifacts
+if [ -d "example/macos" ]; then
+    log_action "Cleaning example macOS CocoaPods artifacts"
+    rm -rf example/macos/Pods
+    rm -f example/macos/Podfile.lock
+    rm -rf example/macos/.symlinks
+    rm -rf example/macos/Flutter/ephemeral
+    log_ok
+fi
+
+# Clean Xcode derived data
+log_action "Cleaning Xcode derived data"
+rm -rf ~/Library/Developer/Xcode/DerivedData/*spine_flutter*
+log_ok
+
+# Clean pub cache for local packages
+log_action "Cleaning pub cache"
+rm -rf .dart_tool
+rm -rf .packages
+rm -f .flutter-plugins
+rm -f .flutter-plugins-dependencies
+rm -f pubspec.lock
+if [ -d "example" ]; then
+    rm -rf example/.dart_tool
+    rm -rf example/.packages
+    rm -f example/.flutter-plugins
+    rm -f example/.flutter-plugins-dependencies
+    rm -f example/pubspec.lock
+fi
+log_ok
+
+log_summary "✓ Clean completed successfully"
+log_detail "Run 'flutter pub get' to restore dependencies"
+log_detail "Run 'cd example && pod install' for iOS/macOS to regenerate pod files"
\ No newline at end of file
diff --git a/spine-flutter/example/ios/Podfile.lock b/spine-flutter/example/ios/Podfile.lock
deleted file mode 100644
index ef078a776..000000000
--- a/spine-flutter/example/ios/Podfile.lock
+++ /dev/null
@@ -1,22 +0,0 @@
-PODS:
-  - Flutter (1.0.0)
-  - spine_flutter (0.0.1):
-    - Flutter
-
-DEPENDENCIES:
-  - Flutter (from `Flutter`)
-  - spine_flutter (from `.symlinks/plugins/spine_flutter/ios`)
-
-EXTERNAL SOURCES:
-  Flutter:
-    :path: Flutter
-  spine_flutter:
-    :path: ".symlinks/plugins/spine_flutter/ios"
-
-SPEC CHECKSUMS:
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  spine_flutter: 6181f4ff23c3d7b53a656057e290c8f76f304a2a
-
-PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
-
-COCOAPODS: 1.16.2
diff --git a/spine-flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/spine-flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift
index cccf817a5..bfa0333a3 100644
--- a/spine-flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/spine-flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,6 +5,5 @@
 import FlutterMacOS
 import Foundation
 
-
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
 }
diff --git a/spine-flutter/example/pubspec.lock b/spine-flutter/example/pubspec.lock
index 9b2c03247..5ca3c43da 100644
--- a/spine-flutter/example/pubspec.lock
+++ b/spine-flutter/example/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.13.0"
   characters:
     dependency: transitive
     description:
@@ -29,18 +29,18 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   ffi:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: "direct main"
     description:
       name: flame
-      sha256: f9e7a100c25f8d6bfd143bf325a9689c509216cd1c8133ce4684955c56770de7
+      sha256: c50e2f39e118f5f6a6f3339ce6825ee803c7e5fada95ec50fb02eb27944e0e76
       url: "https://pub.dev"
     source: hosted
-    version: "1.28.1"
+    version: "1.30.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,10 +66,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
+      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   http:
     dependency: transitive
     description:
@@ -82,18 +82,18 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
   inject_js:
     dependency: transitive
     description:
       name: inject_js
-      sha256: "3ab213e2c76375a611f57eb0044d32c6e18c5091d52510e7fe9f88f6bee83d19"
+      sha256: "849eacfd4b7e9182a7e743843a820d74bf1abcb692bdbe09e34ef0f753ad7227"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   js:
     dependency: transitive
     description:
@@ -130,10 +130,10 @@ packages:
     dependency: transitive
     description:
       name: ordered_set
-      sha256: dc68b8f1abc7115b81cf890bf7d2ece4ed1d95e0f3e486ab4b64ab3d16d2ea42
+      sha256: d6c1d053a533e84931a388cbf03f1ad21a0543bf06c7a281859d3ffacd8e15f2
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "8.0.0"
   path:
     dependency: transitive
     description:
@@ -159,10 +159,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.1"
   spine_flutter:
     dependency: "direct main"
     description:
@@ -174,26 +174,26 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.4.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   universal_ffi:
     dependency: transitive
     description:
diff --git a/spine-flutter/example/web/index.html b/spine-flutter/example/web/index.html
index 41b3bc336..034643ffd 100644
--- a/spine-flutter/example/web/index.html
+++ b/spine-flutter/example/web/index.html
@@ -1,58 +1,22 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <!--
-    If you are serving your web app in a path other than the root, change the
-    href value below to reflect the base path you are serving from.
-
-    The path provided below has to start and end with a slash "/" in order for
-    it to work correctly.
-
-    For more details:
-    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
-
-    This is a placeholder for base href that will be replaced by the value of
-    the `--base-href` argument provided to `flutter build`.
-  -->
   <base href="$FLUTTER_BASE_HREF">
-
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
   <meta name="description" content="A new Flutter project.">
-
-  <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <meta name="apple-mobile-web-app-title" content="example">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
-
-  <!-- Favicon -->
   <link rel="icon" type="image/png" href="favicon.png"/>
 
-  <title>example</title>
+  <title>Spine Flutter</title>
   <link rel="manifest" href="manifest.json">
-
-  <script>
-    // The value below is injected by flutter build, do not touch.
-    var serviceWorkerVersion = null;
-  </script>
-  <!-- This script adds the flutter initialization JS code -->
-  <script src="flutter.js" defer></script>
 </head>
 <body>
   <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        }
-      }).then(function(engineInitializer) {
-        return engineInitializer.initializeEngine();
-      }).then(function(appRunner) {
-        return appRunner.runApp();
-      });
-    });
+    {{flutter_bootstrap_js}}
   </script>
 </body>
 </html>
diff --git a/spine-flutter/lib/raw_image_provider.dart b/spine-flutter/lib/raw_image_provider.dart
index 6877d2d1b..9837b977a 100644
--- a/spine-flutter/lib/raw_image_provider.dart
+++ b/spine-flutter/lib/raw_image_provider.dart
@@ -59,10 +59,6 @@ class RawImageProvider extends ImageProvider<RawImageKey> {
       height: image.height,
       pixelFormat: image.pixelFormat,
     );
-    assert(() {
-      debugPrint('ImageDescriptor: ${descriptor.width}x${descriptor.height}');
-      return true;
-    }());
     return descriptor.instantiateCodec(targetWidth: targetWidth, targetHeight: targetHeight);
   }
 }
diff --git a/spine-flutter/setup.sh b/spine-flutter/setup.sh
index 2446b942d..eadf8c0d8 100755
--- a/spine-flutter/setup.sh
+++ b/spine-flutter/setup.sh
@@ -13,7 +13,7 @@ log_detail "as the podspec file resides in. Copying spine-cpp sources to platfor
 # Clean destination directories
 log_action "Cleaning destination directories"
 rm -rf ios/Classes/spine-c ios/Classes/spine-cpp
-rm -rf macos/Classes/spine-c macos/Classes/spine-cpp  
+rm -rf macos/Classes/spine-c macos/Classes/spine-cpp
 rm -rf src/spine-c src/spine-cpp
 log_ok
 
@@ -36,6 +36,7 @@ else
     log_error_output "$CP_OUTPUT"
     exit 1
 fi
+rm -f ios/Classes/spine-cpp/src/no-cpprt.cpp
 
 log_action "Copying spine-c to macOS Classes"
 mkdir -p macos/Classes/spine-c
@@ -56,6 +57,7 @@ else
     log_error_output "$CP_OUTPUT"
     exit 1
 fi
+rm -f macos/Classes/spine-cpp/src/no-cpprt.cpp
 
 log_action "Copying spine-c to src directory"
 mkdir -p src/spine-c
@@ -76,5 +78,6 @@ else
     log_error_output "$CP_OUTPUT"
     exit 1
 fi
+rm -f src/spine-cpp/src/no-cpprt.cpp
 
-log_summary "✓ Flutter setup completed successfully"
\ No newline at end of file
+log_summary "✓ Flutter setup completed successfully"