diff --git a/.config/zepter.yaml b/.config/zepter.yaml
index 7db6967b9b..be52cd791d 100644
--- a/.config/zepter.yaml
+++ b/.config/zepter.yaml
@@ -12,7 +12,7 @@ workflows:
         # Check that `A` activates the features of `B`.
         'propagate-feature',
         # These are the features to check:
-        '--features=try-runtime,runtime-benchmarks,std,ahm-kusama,stable2503',
+        '--features=try-runtime,runtime-benchmarks,std,stable2503',
         # Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
         '--left-side-feature-missing=ignore',
         # Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d7de36be99..ada10a81e0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -187,8 +187,10 @@ jobs:
 
       - name: Download AHM test snapshots
         run: |
-          curl -sL 'https://tasty.limo/uploads/polkadot-2025-05-09.snap.lz4' -o polkadot.snap.lz4
-          curl -sL 'https://tasty.limo/uploads/ah-polkadot-2025-05-09.snap.lz4' -o ah-polkadot.snap.lz4
+          python3 -m pip install gdown
+          gdown 1USQPAxqhflyiw1aeJIILTqrNJr9ZjvzR # 2025-07-28
+          gdown 1Z21yzXbQrD5rGFTZnSjrTHi9CGhGPi4z # 2025-07-28
+
           lz4 -d polkadot.snap.lz4 polkadot.snap
           lz4 -d ah-polkadot.snap.lz4 ah-polkadot.snap
 
diff --git a/Cargo.lock b/Cargo.lock
index 7f8545c703..36074ca8cf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1107,7 +1107,7 @@ dependencies = [
 [[package]]
 name = "asset-test-utils"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcmp-queue",
@@ -1137,7 +1137,7 @@ dependencies = [
 [[package]]
 name = "assets-common"
 version = "0.21.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1430,7 +1430,7 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
 [[package]]
 name = "binary-merkle-tree"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "hash-db",
  "log",
@@ -1684,7 +1684,7 @@ dependencies = [
 [[package]]
 name = "bp-bridge-hub-cumulus"
 version = "0.21.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-messages",
  "bp-polkadot-core",
@@ -1737,7 +1737,7 @@ dependencies = [
 [[package]]
 name = "bp-header-chain"
 version = "0.20.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-runtime",
  "finality-grandpa",
@@ -1754,7 +1754,7 @@ dependencies = [
 [[package]]
 name = "bp-messages"
 version = "0.20.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -1770,7 +1770,7 @@ dependencies = [
 [[package]]
 name = "bp-parachains"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-polkadot-core",
@@ -1787,7 +1787,7 @@ dependencies = [
 [[package]]
 name = "bp-polkadot-core"
 version = "0.20.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -1804,7 +1804,7 @@ dependencies = [
 [[package]]
 name = "bp-relayers"
 version = "0.20.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-messages",
@@ -1822,7 +1822,7 @@ dependencies = [
 [[package]]
 name = "bp-runtime"
 version = "0.20.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1845,7 +1845,7 @@ dependencies = [
 [[package]]
 name = "bp-test-utils"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-parachains",
@@ -1865,7 +1865,7 @@ dependencies = [
 [[package]]
 name = "bp-xcm-bridge-hub"
 version = "0.6.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -1882,7 +1882,7 @@ dependencies = [
 [[package]]
 name = "bp-xcm-bridge-hub-router"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -1894,7 +1894,7 @@ dependencies = [
 [[package]]
 name = "bridge-hub-common"
 version = "0.13.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2213,7 +2213,7 @@ dependencies = [
 [[package]]
 name = "bridge-hub-test-utils"
 version = "0.22.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "asset-test-utils",
  "bp-header-chain",
@@ -2255,7 +2255,7 @@ dependencies = [
 [[package]]
 name = "bridge-runtime-common"
 version = "0.21.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-messages",
@@ -3343,7 +3343,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-aura-ext"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "frame-support",
@@ -3360,7 +3360,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
@@ -3395,7 +3395,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
@@ -3406,7 +3406,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-session-benchmarking"
 version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3419,7 +3419,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcm"
 version = "0.19.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -3434,7 +3434,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bounded-collections",
  "bp-xcm-bridge-hub-router",
@@ -3459,7 +3459,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-aura"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "sp-api",
  "sp-consensus-aura",
@@ -3468,7 +3468,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.18.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -3484,7 +3484,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.18.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -3498,7 +3498,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-proof-size-hostfunction"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "sp-externalities 0.30.0 (git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo)",
  "sp-runtime-interface 29.0.1 (git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo)",
@@ -3508,7 +3508,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-utility"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -3525,7 +3525,7 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
@@ -4074,7 +4074,7 @@ dependencies = [
 [[package]]
 name = "emulated-integration-tests-common"
 version = "20.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "asset-test-utils",
  "bp-messages",
@@ -4468,7 +4468,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "13.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -4491,7 +4491,7 @@ checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
 [[package]]
 name = "frame-benchmarking"
 version = "40.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -4529,7 +4529,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
@@ -4540,7 +4540,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -4557,7 +4557,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "40.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "aquamarine",
  "frame-support",
@@ -4599,7 +4599,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata-hash-extension"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "const-hex",
@@ -4615,7 +4615,7 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.50.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "futures",
  "indicatif",
@@ -4637,7 +4637,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "aquamarine",
  "array-bytes",
@@ -4678,7 +4678,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "33.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -4698,7 +4698,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "13.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 3.3.0",
@@ -4710,7 +4710,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4720,7 +4720,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cfg-if",
  "docify",
@@ -4739,7 +4739,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4753,7 +4753,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "parity-scale-codec",
@@ -4763,7 +4763,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.46.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -8004,7 +8004,7 @@ dependencies = [
 [[package]]
 name = "pallet-alliance"
 version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "frame-benchmarking",
@@ -8024,7 +8024,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-conversion"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8042,7 +8042,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-conversion-tx-payment"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8057,7 +8057,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-rate"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8071,7 +8071,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-tx-payment"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8088,7 +8088,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "42.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8104,7 +8104,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8120,7 +8120,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8135,7 +8135,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8148,7 +8148,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8171,7 +8171,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "aquamarine",
  "docify",
@@ -8192,7 +8192,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "41.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8208,7 +8208,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "41.1.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8227,7 +8227,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "41.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "binary-merkle-tree",
@@ -8252,7 +8252,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8269,7 +8269,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-grandpa"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -8288,7 +8288,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-messages"
 version = "0.20.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-messages",
@@ -8307,7 +8307,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-parachains"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-parachains",
@@ -8327,7 +8327,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-relayers"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-header-chain",
  "bp-messages",
@@ -8350,7 +8350,7 @@ dependencies = [
 [[package]]
 name = "pallet-broker"
 version = "0.19.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -8368,7 +8368,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8386,7 +8386,7 @@ dependencies = [
 [[package]]
 name = "pallet-collator-selection"
 version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8405,7 +8405,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8422,7 +8422,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8438,7 +8438,7 @@ dependencies = [
 [[package]]
 name = "pallet-core-fellowship"
 version = "24.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8456,7 +8456,7 @@ dependencies = [
 [[package]]
 name = "pallet-delegated-staking"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8471,7 +8471,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-block"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8492,7 +8492,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8513,7 +8513,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8526,7 +8526,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8544,7 +8544,7 @@ dependencies = [
 [[package]]
 name = "pallet-glutton"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "blake2 0.10.6",
  "frame-benchmarking",
@@ -8562,7 +8562,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8584,7 +8584,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -8600,7 +8600,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8619,7 +8619,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8634,7 +8634,7 @@ dependencies = [
 [[package]]
 name = "pallet-message-queue"
 version = "43.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -8653,7 +8653,7 @@ dependencies = [
 [[package]]
 name = "pallet-migrations"
 version = "10.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8672,7 +8672,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8684,7 +8684,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8695,7 +8695,7 @@ dependencies = [
 [[package]]
 name = "pallet-nft-fractionalization"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8711,7 +8711,7 @@ dependencies = [
 [[package]]
 name = "pallet-nfts"
 version = "34.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -8728,7 +8728,7 @@ dependencies = [
 [[package]]
 name = "pallet-nfts-runtime-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8737,7 +8737,7 @@ dependencies = [
 [[package]]
 name = "pallet-nis"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "polkadot-sdk-frame",
@@ -8747,7 +8747,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "38.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8765,7 +8765,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8785,7 +8785,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "36.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
@@ -8795,7 +8795,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8810,7 +8810,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8833,7 +8833,7 @@ dependencies = [
 [[package]]
 name = "pallet-parameters"
 version = "0.11.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8850,7 +8850,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8866,7 +8866,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "polkadot-sdk-frame",
@@ -8876,7 +8876,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8946,7 +8946,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8960,7 +8960,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8999,7 +8999,7 @@ dependencies = [
 [[package]]
 name = "pallet-revive"
 version = "0.6.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "alloy-core",
  "derive_more 0.99.20",
@@ -9047,7 +9047,7 @@ dependencies = [
 [[package]]
 name = "pallet-revive-fixtures"
 version = "0.3.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "anyhow",
  "cargo_metadata",
@@ -9061,7 +9061,7 @@ dependencies = [
 [[package]]
 name = "pallet-revive-proc-macro"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9071,7 +9071,7 @@ dependencies = [
 [[package]]
 name = "pallet-revive-uapi"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bitflags 1.3.2",
  "pallet-revive-proc-macro",
@@ -9083,7 +9083,7 @@ dependencies = [
 [[package]]
 name = "pallet-salary"
 version = "25.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "log",
  "pallet-ranked-collective",
@@ -9095,7 +9095,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "41.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9112,7 +9112,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "40.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9134,7 +9134,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9150,7 +9150,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9167,7 +9167,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "40.1.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -9189,7 +9189,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-async"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -9212,7 +9212,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-async-ah-client"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9233,7 +9233,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-async-rc-client"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9250,7 +9250,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
@@ -9261,7 +9261,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "22.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -9270,7 +9270,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-runtime-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9280,7 +9280,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "44.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9296,7 +9296,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9311,7 +9311,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9330,7 +9330,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9346,7 +9346,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -9358,7 +9358,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9377,7 +9377,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9391,7 +9391,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9406,7 +9406,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9420,7 +9420,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "polkadot-sdk-frame",
@@ -9430,7 +9430,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm"
 version = "19.1.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -9453,7 +9453,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-benchmarks"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9470,7 +9470,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-bridge-hub"
 version = "0.16.3"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -9492,7 +9492,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-bridge-hub-router"
 version = "0.18.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-xcm-bridge-hub-router",
  "frame-benchmarking",
@@ -9511,7 +9511,7 @@ dependencies = [
 [[package]]
 name = "parachains-common"
 version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-primitives-utility",
@@ -9540,7 +9540,7 @@ dependencies = [
 [[package]]
 name = "parachains-runtimes-test-utils"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcmp-queue",
@@ -9739,7 +9739,7 @@ dependencies = [
 [[package]]
 name = "penpal-runtime"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "assets-common",
  "cumulus-pallet-aura-ext",
@@ -10155,7 +10155,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "17.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10237,7 +10237,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain-primitives"
 version = "16.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bounded-collections",
  "derive_more 0.99.20",
@@ -10253,7 +10253,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "18.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bitvec",
  "hex-literal",
@@ -10390,7 +10390,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "19.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -10458,7 +10458,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bs58",
  "frame-benchmarking",
@@ -10470,7 +10470,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "19.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bitflags 1.3.2",
  "bitvec",
@@ -10527,7 +10527,7 @@ dependencies = [
 [[package]]
 name = "polkadot-sdk-frame"
 version = "0.9.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -11584,7 +11584,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime-constants"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11941,7 +11941,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "log",
  "sp-core 36.1.0",
@@ -11952,7 +11952,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -11967,7 +11967,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "42.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "docify",
@@ -11993,7 +11993,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
@@ -12004,7 +12004,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "fnv",
  "futures",
@@ -12030,7 +12030,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "futures",
@@ -12053,7 +12053,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "ahash",
  "array-bytes",
@@ -12097,7 +12097,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.42.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -12120,7 +12120,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.38.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "polkavm 0.18.0",
  "sc-allocator",
@@ -12133,7 +12133,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-polkavm"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "log",
  "polkavm 0.18.0",
@@ -12144,7 +12144,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.38.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "anyhow",
  "log",
@@ -12160,7 +12160,7 @@ dependencies = [
 [[package]]
 name = "sc-mixnet"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "arrayvec 0.7.6",
@@ -12188,7 +12188,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.49.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "async-channel 1.9.0",
@@ -12238,7 +12238,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bitflags 1.3.2",
  "parity-scale-codec",
@@ -12248,7 +12248,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.49.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "ahash",
  "futures",
@@ -12267,7 +12267,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "async-channel 1.9.0",
@@ -12302,7 +12302,7 @@ dependencies = [
 [[package]]
 name = "sc-network-types"
 version = "0.15.4"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bs58",
  "bytes",
@@ -12321,7 +12321,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -12341,7 +12341,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "28.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "chrono",
  "futures",
@@ -12360,7 +12360,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "futures",
@@ -12377,7 +12377,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "18.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-channel 1.9.0",
  "futures",
@@ -13029,7 +13029,7 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 [[package]]
 name = "slot-range-helper"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -13180,7 +13180,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-beacon-primitives"
 version = "0.13.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "byte-slice-cast",
  "frame-support",
@@ -13202,7 +13202,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-core"
 version = "0.13.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bp-relayers",
  "ethabi-decode",
@@ -13227,7 +13227,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-ethereum"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "ethabi-decode",
  "ethbloom",
@@ -13247,7 +13247,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-inbound-queue-primitives"
 version = "0.2.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "alloy-core",
  "frame-support",
@@ -13271,7 +13271,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-merkle-tree"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13297,7 +13297,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-outbound-queue-primitives"
 version = "0.2.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "alloy-core",
  "ethabi-decode",
@@ -13323,7 +13323,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-outbound-queue-runtime-api"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -13337,7 +13337,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-pallet-ethereum-client"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -13363,7 +13363,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-pallet-ethereum-client-fixtures"
 version = "0.21.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "hex-literal",
  "snowbridge-beacon-primitives",
@@ -13376,7 +13376,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-pallet-inbound-queue"
 version = "0.13.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "alloy-core",
  "frame-benchmarking",
@@ -13403,7 +13403,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-pallet-inbound-queue-fixtures"
 version = "0.21.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "hex-literal",
  "snowbridge-beacon-primitives",
@@ -13416,7 +13416,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-pallet-outbound-queue"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bridge-hub-common",
  "ethabi-decode",
@@ -13439,7 +13439,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-pallet-system"
 version = "0.13.3"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -13460,7 +13460,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-runtime-common"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -13479,7 +13479,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-runtime-test-common"
 version = "0.15.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "frame-support",
@@ -13510,7 +13510,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-system-runtime-api"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "snowbridge-core",
@@ -13522,7 +13522,7 @@ dependencies = [
 [[package]]
 name = "snowbridge-verification-primitives"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -13560,7 +13560,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "36.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "hash-db",
@@ -13582,7 +13582,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "22.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
@@ -13596,7 +13596,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13608,7 +13608,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "26.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "docify",
  "integer-sqrt",
@@ -13622,7 +13622,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "36.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13634,7 +13634,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "36.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "sp-api",
  "sp-inherents",
@@ -13644,7 +13644,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -13663,7 +13663,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.42.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "futures",
@@ -13677,7 +13677,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.42.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13693,7 +13693,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.42.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13711,7 +13711,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-beefy"
 version = "24.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13731,7 +13731,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "23.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -13748,7 +13748,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.42.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13806,7 +13806,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "36.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "ark-vrf",
  "array-bytes",
@@ -13867,7 +13867,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -13880,7 +13880,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "quote",
  "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo)",
@@ -13890,7 +13890,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.3",
@@ -13910,7 +13910,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -13931,7 +13931,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.30.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -13941,7 +13941,7 @@ dependencies = [
 [[package]]
 name = "sp-genesis-builder"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13953,7 +13953,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "36.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -13966,7 +13966,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "40.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bytes",
  "docify",
@@ -13992,7 +13992,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "41.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "sp-core 36.1.0",
  "sp-runtime",
@@ -14002,7 +14002,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.42.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -14013,7 +14013,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "thiserror 1.0.69",
  "zstd 0.12.4",
@@ -14022,7 +14022,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-metadata 20.0.0",
  "parity-scale-codec",
@@ -14032,7 +14032,7 @@ dependencies = [
 [[package]]
 name = "sp-mixnet"
 version = "0.14.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14043,7 +14043,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "36.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -14060,7 +14060,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14073,7 +14073,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "36.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "sp-api",
  "sp-core 36.1.0",
@@ -14083,7 +14083,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "backtrace",
  "regex",
@@ -14092,7 +14092,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "rustc-hash 1.1.0",
  "serde",
@@ -14102,7 +14102,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "31.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "binary-merkle-tree",
  "docify",
@@ -14150,7 +14150,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "29.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -14183,7 +14183,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "18.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "Inflector",
  "expander",
@@ -14196,7 +14196,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "38.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14210,7 +14210,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -14223,7 +14223,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.45.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "hash-db",
  "log",
@@ -14249,7 +14249,7 @@ checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834"
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 
 [[package]]
 name = "sp-storage"
@@ -14267,7 +14267,7 @@ dependencies = [
 [[package]]
 name = "sp-storage"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14279,7 +14279,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "36.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -14303,7 +14303,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "17.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -14314,7 +14314,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "36.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -14323,7 +14323,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "ahash",
  "hash-db",
@@ -14345,7 +14345,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14362,7 +14362,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-warning",
@@ -14386,7 +14386,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "21.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -14398,7 +14398,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "31.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -14594,7 +14594,7 @@ dependencies = [
 [[package]]
 name = "staging-parachain-info"
 version = "0.20.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -14607,7 +14607,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm"
 version = "16.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "bounded-collections",
@@ -14628,7 +14628,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm-builder"
 version = "20.1.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "environmental",
  "frame-support",
@@ -14652,7 +14652,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm-executor"
 version = "19.1.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -14751,7 +14751,7 @@ dependencies = [
 [[package]]
 name = "substrate-bip39"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
@@ -14776,7 +14776,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.17.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "http-body-util",
  "hyper 1.6.0",
@@ -14790,7 +14790,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -14803,7 +14803,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "26.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "build-helper",
@@ -15192,7 +15192,7 @@ checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
 [[package]]
 name = "testnet-parachains-constants"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -16452,7 +16452,7 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 [[package]]
 name = "westend-runtime-constants"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -17052,7 +17052,7 @@ dependencies = [
 [[package]]
 name = "xcm-emulator"
 version = "0.19.3"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "array-bytes",
  "cumulus-pallet-parachain-system",
@@ -17086,7 +17086,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "11.0.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -17097,7 +17097,7 @@ dependencies = [
 [[package]]
 name = "xcm-runtime-apis"
 version = "0.7.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -17111,7 +17111,7 @@ dependencies = [
 [[package]]
 name = "xcm-simulator"
 version = "20.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#599ff333d2e930db8ed96fc1cba6022b74d9c06f"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=oty-2503-paseo#d007f7be5782a6c3f595f3a0fd45bd08a2edb79e"
 dependencies = [
  "frame-support",
  "frame-system",
diff --git a/integration-tests/ahm/Justfile b/integration-tests/ahm/Justfile
deleted file mode 100644
index 0478cde2d7..0000000000
--- a/integration-tests/ahm/Justfile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Print help
-help:
-	@just --list
-
-snapshot RUNTIME:
-	#!/usr/bin/env bash
-	set -ex
-
-	# Check if {{RUNTIME}}.snap and ah-{{RUNTIME}}.snap exist, otherwise download
-	if [ ! -f {{RUNTIME}}.snap ]; then
-		echo "Downloading {{RUNTIME}}.snap"
-		curl -sL 'https://tasty.limo/uploads/{{RUNTIME}}.snap.lz4' -o {{RUNTIME}}.snap.lz4
-		echo "Decompressing {{RUNTIME}}.snap.lz4"
-		lz4 -d {{RUNTIME}}.snap.lz4 {{RUNTIME}}.snap
-	else
-		echo "{{RUNTIME}}.snap already exists"
-	fi
-
-	if [ ! -f ah-{{RUNTIME}}.snap ]; then
-		echo "Downloading ah-{{RUNTIME}}.snap"
-		curl -sL 'https://tasty.limo/uploads/ah-{{RUNTIME}}.snap.lz4' -o ah-{{RUNTIME}}.snap.lz4
-		echo "Decompressing ah-{{RUNTIME}}.snap.lz4"
-		lz4 -d ah-{{RUNTIME}}.snap.lz4 ah-{{RUNTIME}}.snap
-	else
-		echo "ah-{{RUNTIME}}.snap already exists"
-	fi
diff --git a/integration-tests/ahm/src/balances_test.rs b/integration-tests/ahm/src/balances_test.rs
index c3fcefe27a..5ee21e8df3 100644
--- a/integration-tests/ahm/src/balances_test.rs
+++ b/integration-tests/ahm/src/balances_test.rs
@@ -90,7 +90,7 @@ impl AhMigrationCheck for BalancesCrossChecker {
 
 	fn post_check(rc_pre_payload: Self::RcPrePayload, ah_pre_payload: Self::AhPrePayload) {
 		let (rc_total_issuance_before, rc_checking_balance_before) = rc_pre_payload;
-		let (ah_total_issuance_before, ah_checking_balance_before) = ah_pre_payload;
+		let (ah_total_issuance_before, _ah_checking_balance_before) = ah_pre_payload;
 
 		let ah_checking_balance_after = pallet_balances::Pallet::<AhRuntime>::total_balance(
 			&<AhRuntime as pallet_ah_migrator::Config>::CheckingAccount::get(),
@@ -122,9 +122,7 @@ impl AhMigrationCheck for BalancesCrossChecker {
 		// Currently allowing for a difference of 0.1 DOT.
 		assert!(
 			ah_total_issuance_after.abs_diff(rc_total_issuance_before) < MIN_DOT_ERROR,
-			"Total issuance is not correctly tracked: before migration {} after migration {}.",
-			rc_total_issuance_before,
-			ah_total_issuance_after
+			"Total issuance is not correctly tracked: before migration {rc_total_issuance_before} after migration {ah_total_issuance_after}."
 		);
 	}
 }
diff --git a/integration-tests/ahm/src/call_filter_asset_hub.rs b/integration-tests/ahm/src/call_filter_asset_hub.rs
index c7770dba75..7a2a14a137 100644
--- a/integration-tests/ahm/src/call_filter_asset_hub.rs
+++ b/integration-tests/ahm/src/call_filter_asset_hub.rs
@@ -16,16 +16,10 @@
 
 //! Asset Hub Migration tests.
 
-use crate::porting_prelude::*;
-
-use asset_hub_polkadot_runtime::{
-	AhMigrator, Block, BuildStorage, Runtime as T, RuntimeCall, RuntimeOrigin, System,
-};
+use asset_hub_polkadot_runtime::{BuildStorage, Runtime as T, RuntimeCall, RuntimeOrigin};
 use cumulus_primitives_core::AggregateMessageOrigin;
 use frame_support::{sp_runtime::traits::Dispatchable, traits::Contains};
 use pallet_ah_migrator::*;
-use polkadot_primitives::Id as ParaId;
-use remote_externalities::{Builder, Mode, OfflineConfig, RemoteExternalities};
 use sp_runtime::AccountId32;
 
 /// Check that the call filtering mechanism works.
diff --git a/integration-tests/ahm/src/call_filter_relay.rs b/integration-tests/ahm/src/call_filter_relay.rs
index a1dd379c89..5d3e5a465e 100644
--- a/integration-tests/ahm/src/call_filter_relay.rs
+++ b/integration-tests/ahm/src/call_filter_relay.rs
@@ -16,15 +16,10 @@
 
 //! Asset Hub Migration tests.
 
-use crate::porting_prelude::*;
-
 use frame_support::{sp_runtime::traits::Dispatchable, traits::Contains};
 use pallet_rc_migrator::*;
 use polkadot_primitives::Id as ParaId;
-use polkadot_runtime::{
-	Block, BuildStorage, RcMigrator, Runtime as T, RuntimeCall, RuntimeOrigin, System,
-};
-use remote_externalities::{Builder, Mode, OfflineConfig, RemoteExternalities};
+use polkadot_runtime::{BuildStorage, Runtime as T, RuntimeCall, RuntimeOrigin};
 use runtime_parachains::inclusion::AggregateMessageOrigin;
 use sp_runtime::AccountId32;
 
diff --git a/integration-tests/ahm/src/checks.rs b/integration-tests/ahm/src/checks.rs
index 9d8b52bb7d..ca214f2af1 100644
--- a/integration-tests/ahm/src/checks.rs
+++ b/integration-tests/ahm/src/checks.rs
@@ -18,18 +18,8 @@
 
 use crate::porting_prelude::*;
 
-use frame_support::{
-	pallet_prelude::*,
-	traits::{Currency, Defensive},
-};
-use frame_system::pallet_prelude::*;
 use pallet_ah_migrator::types::AhMigrationCheck;
-use pallet_rc_migrator::types::{RcMigrationCheck, ToPolkadotSs58};
-use sp_runtime::{
-	traits::{Dispatchable, TryConvert},
-	AccountId32,
-};
-use std::{collections::BTreeMap, str::FromStr};
+use pallet_rc_migrator::types::RcMigrationCheck;
 
 pub struct SanityChecks;
 
@@ -40,8 +30,8 @@ impl RcMigrationCheck for SanityChecks {
 		assert!(
 			pallet_rc_migrator::RcMigrationStage::<RcRuntime>::get() ==
 				pallet_rc_migrator::MigrationStage::Scheduled {
-					start: 0u32.into(),
-					cool_off_end: 0u32.into(),
+					start: 0u32,
+					cool_off_end: 0u32,
 				}
 		);
 	}
@@ -65,7 +55,7 @@ impl AhMigrationCheck for SanityChecks {
 		);
 	}
 
-	fn post_check(rc_pre_payload: Self::RcPrePayload, _: Self::AhPrePayload) {
+	fn post_check(_rc_pre_payload: Self::RcPrePayload, _: Self::AhPrePayload) {
 		assert!(
 			pallet_ah_migrator::AhMigrationStage::<AhRuntime>::get() ==
 				pallet_ah_migrator::MigrationStage::MigrationDone
@@ -76,10 +66,10 @@ impl AhMigrationCheck for SanityChecks {
 /// Assert that the root hash is what we expect.
 pub fn assert_root_hash(chain: &str, want_hex: &str) {
 	let got = hex::encode(sp_io::storage::root(sp_runtime::StateVersion::V1));
-	println!("{chain} root hash: {:?}", got);
+	println!("{chain} root hash: {got:?}");
 	if got == want_hex {
 		return
 	}
 
-	panic!("The root hash of {chain} is not as expected. Please adjust the root hash in integration-tests/ahm/src/checks.rs\nExpected: {}\nGot:      {}", want_hex, got);
+	panic!("The root hash of {chain} is not as expected. Please adjust the root hash in integration-tests/ahm/src/checks.rs\nExpected: {want_hex}\nGot:      {got}");
 }
diff --git a/integration-tests/ahm/src/lib.rs b/integration-tests/ahm/src/lib.rs
index 3b2cbf58f7..59846ae6da 100644
--- a/integration-tests/ahm/src/lib.rs
+++ b/integration-tests/ahm/src/lib.rs
@@ -35,15 +35,7 @@ pub mod xcm_route;
 
 /// Imports for the AHM tests that can be reused for other chains.
 pub mod porting_prelude {
-	// Dependency renaming depending on runtimes or SDK names:
-	#[cfg(not(feature = "ahm-kusama"))]
-	pub mod dependency_alias {
-		// Polkadot it is the canonical code
-	}
-	pub use dependency_alias::*;
-
-	// Import renaming depending on runtimes or SDK names:
-	#[cfg(not(feature = "ahm-kusama"))]
+	// For Kusama, we will add a feature here. For now it is just a stub.
 	pub mod import_alias {
 		pub use polkadot_runtime_constants::DOLLARS as RC_DOLLARS;
 	}
@@ -59,6 +51,5 @@ pub mod porting_prelude {
 		RuntimeOrigin as RcRuntimeOrigin,
 	};
 
-	#[cfg(not(feature = "ahm-kusama"))]
 	pub use polkadot_runtime_constants::proxy as rc_proxy_definition;
 }
diff --git a/integration-tests/ahm/src/mock.rs b/integration-tests/ahm/src/mock.rs
index d21c8cec4c..1c8a4cb2e1 100644
--- a/integration-tests/ahm/src/mock.rs
+++ b/integration-tests/ahm/src/mock.rs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::porting_prelude::*;
-
 use asset_hub_polkadot_runtime::{AhMigrator, Runtime as AssetHub, RuntimeEvent as AhRuntimeEvent};
 use codec::Decode;
 use cumulus_primitives_core::{
@@ -51,12 +49,16 @@ pub enum Chain {
 	AssetHub,
 }
 
-impl ToString for Chain {
-	fn to_string(&self) -> String {
-		match self {
-			Chain::Relay => "SNAP_RC".to_string(),
-			Chain::AssetHub => "SNAP_AH".to_string(),
-		}
+impl std::fmt::Display for Chain {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(
+			f,
+			"{}",
+			match self {
+				Chain::Relay => "SNAP_RC",
+				Chain::AssetHub => "SNAP_AH",
+			}
+		)
 	}
 }
 
@@ -77,7 +79,7 @@ pub async fn load_externalities() -> Option<(TestExternalities, TestExternalitie
 
 pub async fn remote_ext_test_setup(chain: Chain) -> Option<TestExternalities> {
 	sp_tracing::try_init_simple();
-	log::info!("Checking {} snapshot cache", chain.to_string());
+	log::info!("Checking {chain} snapshot cache");
 
 	let cache = match chain {
 		Chain::Relay => &RC_CACHE,
@@ -86,10 +88,10 @@ pub async fn remote_ext_test_setup(chain: Chain) -> Option<TestExternalities> {
 
 	let snapshot = cache
 		.get_or_init(|| async {
-			log::info!("Loading {} snapshot", chain.to_string());
+			log::info!("Loading {chain} snapshot");
 
 			// Load snapshot.
-			let snap = std::env::var(chain.to_string()).ok().expect("Env var not set");
+			let snap = std::env::var(chain.to_string()).expect("Env var not set");
 			let abs = std::path::absolute(snap.clone());
 
 			let ext = Builder::<PolkadotBlock>::default()
@@ -97,7 +99,7 @@ pub async fn remote_ext_test_setup(chain: Chain) -> Option<TestExternalities> {
 				.build()
 				.await
 				.map_err(|e| {
-					eprintln!("Could not load from snapshot: {:?}: {:?}", abs, e);
+					eprintln!("Could not load from snapshot: {abs:?}: {e:?}");
 				})
 				.unwrap();
 
@@ -109,7 +111,7 @@ pub async fn remote_ext_test_setup(chain: Chain) -> Option<TestExternalities> {
 
 	let ext = TestExternalities::from_raw_snapshot(
 		snapshot.0.clone(),
-		snapshot.1.clone(),
+		snapshot.1,
 		sp_storage::StateVersion::V1,
 	);
 
@@ -119,7 +121,7 @@ pub async fn remote_ext_test_setup(chain: Chain) -> Option<TestExternalities> {
 pub fn next_block_rc() {
 	let past = frame_system::Pallet::<Polkadot>::block_number();
 	let now = past + 1;
-	log::debug!(target: LOG_RC, "Executing RC block: {:?}", now);
+	log::debug!(target: LOG_RC, "Executing RC block: {now:?}");
 	frame_system::Pallet::<Polkadot>::set_block_number(now);
 	frame_system::Pallet::<Polkadot>::reset_events();
 	let weight = <polkadot_runtime::MessageQueue as OnInitialize<_>>::on_initialize(now);
@@ -137,7 +139,7 @@ pub fn next_block_rc() {
 					..
 				})
 			) {
-				log::error!(target: LOG_RC, "Message processing error: {:?}", events);
+				log::error!(target: LOG_RC, "Message processing error: {events:?}");
 				true
 			} else {
 				false
@@ -149,16 +151,14 @@ pub fn next_block_rc() {
 	let limit = <Polkadot as frame_system::Config>::BlockWeights::get().max_block;
 	assert!(
 		weight.all_lte(Perbill::from_percent(80) * limit),
-		"Weight exceeded 80% of limit: {:?}, limit: {:?}",
-		weight,
-		limit
+		"Weight exceeded 80% of limit: {weight:?}, limit: {limit:?}"
 	);
 }
 
 pub fn next_block_ah() {
 	let past = frame_system::Pallet::<AssetHub>::block_number();
 	let now = past + 1;
-	log::debug!(target: LOG_AH, "Executing AH block: {:?}", now);
+	log::debug!(target: LOG_AH, "Executing AH block: {now:?}");
 	frame_system::Pallet::<AssetHub>::set_block_number(now);
 	frame_system::Pallet::<AssetHub>::reset_events();
 	let weight = <asset_hub_polkadot_runtime::MessageQueue as OnInitialize<_>>::on_initialize(now);
@@ -176,7 +176,7 @@ pub fn next_block_ah() {
 					..
 				})
 			) {
-				log::error!(target: LOG_AH, "Message processing error: {:?}", events);
+				log::error!(target: LOG_AH, "Message processing error: {events:?}");
 				true
 			} else {
 				false
@@ -188,9 +188,7 @@ pub fn next_block_ah() {
 	let limit = <AssetHub as frame_system::Config>::BlockWeights::get().max_block;
 	assert!(
 		weight.all_lte(Perbill::from_percent(80) * limit),
-		"Weight exceeded 80% of limit: {:?}, limit: {:?}",
-		weight,
-		limit
+		"Weight exceeded 80% of limit: {weight:?}, limit: {limit:?}"
 	);
 }
 
@@ -236,62 +234,32 @@ fn sanity_check_xcm<Call: Decode>(msg: &[u8]) {
 	match xcm {
 		VersionedXcm::V3(inner) =>
 			for instruction in inner.0 {
-				match instruction {
-					xcm::v3::Instruction::Transact { call, .. } => {
-						// Interesting part here: ensure that the receiving runtime can decode the
-						// call
-						let call: Call = Decode::decode(&mut &call.into_encoded()[..])
-							.expect("Must decode DMP XCM call");
-					},
-					_ => (), // Fine, we only check Transacts
+				if let xcm::v3::Instruction::Transact { call, .. } = instruction {
+					// Interesting part here: ensure that the receiving runtime can decode the
+					// call
+					let _call: Call = Decode::decode(&mut &call.into_encoded()[..])
+						.expect("Must decode DMP XCM call");
 				}
 			},
 		VersionedXcm::V4(inner) =>
 			for instruction in inner.0 {
-				match instruction {
-					xcm::v4::Instruction::Transact { call, .. } => {
-						// Interesting part here: ensure that the receiving runtime can decode the
-						// call
-						let call: Call = Decode::decode(&mut &call.into_encoded()[..])
-							.expect("Must decode DMP XCM call");
-					},
-					_ => (), // Fine, we only check Transacts
+				if let xcm::v4::Instruction::Transact { call, .. } = instruction {
+					// Interesting part here: ensure that the receiving runtime can decode the
+					// call
+					let _call: Call = Decode::decode(&mut &call.into_encoded()[..])
+						.expect("Must decode DMP XCM call");
 				}
 			},
 		VersionedXcm::V5(inner) =>
 			for instruction in inner.0 {
-				match instruction {
-					xcm::v5::Instruction::Transact { call, .. } => {
-						// Interesting part here: ensure that the receiving runtime can decode the
-						// call
-						let call: Call = Decode::decode(&mut &call.into_encoded()[..])
-							.expect("Must decode DMP XCM call");
-					},
-					_ => (), // Fine, we only check Transacts
+				if let xcm::v5::Instruction::Transact { call, .. } = instruction {
+					// Interesting part here: ensure that the receiving runtime can decode the
+					// call
+					let _call: Call = Decode::decode(&mut &call.into_encoded()[..])
+						.expect("Must decode DMP XCM call");
 				}
 			},
-		_ => panic!("Wrong XCM version: {:?}", xcm),
-	};
-}
-
-#[cfg(feature = "stable2503")] // XCM V5
-fn sanity_check_xcm<Call: Decode>(msg: &[u8]) {
-	let xcm = xcm::VersionedXcm::<Call>::decode(&mut &msg[..]).expect("Must decode DMP XCM");
-	let xcm = match xcm {
-		VersionedXcm::V5(inner) => inner.0,
-		_ => panic!("Wrong XCM version: {:?}", xcm),
 	};
-
-	for instruction in xcm {
-		match instruction {
-			xcm::v5::Instruction::Transact { call, .. } => {
-				// Interesting part here: ensure that the receiving runtime can decode the call
-				let call: Call = Decode::decode(&mut &call.into_encoded()[..])
-					.expect("Must decode DMP XCM call");
-			},
-			_ => (), // Fine, we only check Transacts
-		}
-	}
 }
 
 // Sets the initial migration stage on the Relay Chain.
@@ -310,7 +278,7 @@ pub fn set_initial_migration_stage(
 			log::info!("Setting start stage: {:?}", &stage);
 			RcMigrationStage::from_str(&stage).expect("Invalid start stage")
 		} else {
-			RcMigrationStage::Scheduled { start: 0u32.into(), cool_off_end: 0u32.into() }
+			RcMigrationStage::Scheduled { start: 0u32, cool_off_end: 0u32 }
 		};
 		RcMigrationStageStorage::<Polkadot>::put(stage.clone());
 		stage
@@ -368,7 +336,7 @@ pub fn ah_migrate(asset_hub: &mut TestExternalities, dmp_messages: Vec<InboundDo
 	asset_hub.execute_with(|| {
 		let mut fp =
 			asset_hub_polkadot_runtime::MessageQueue::footprint(ParachainMessageOrigin::Parent);
-		enqueue_dmp((dmp_messages, 0u32.into()));
+		enqueue_dmp((dmp_messages, 0u32));
 
 		// Loop until no more DMPs are queued
 		loop {
diff --git a/integration-tests/ahm/src/multisig_still_work.rs b/integration-tests/ahm/src/multisig_still_work.rs
index 44675cc512..23e2cb7a0c 100644
--- a/integration-tests/ahm/src/multisig_still_work.rs
+++ b/integration-tests/ahm/src/multisig_still_work.rs
@@ -16,21 +16,8 @@
 
 //! Test that Multisig Account IDs result in the same IDs and they can still dispatch calls.
 
-use crate::porting_prelude::*;
-
-use frame_support::{
-	pallet_prelude::*,
-	traits::{Currency, Defensive},
-};
-use frame_system::pallet_prelude::*;
 use pallet_ah_migrator::types::AhMigrationCheck;
-use pallet_rc_migrator::types::{RcMigrationCheck, ToPolkadotSs58};
-use rand::prelude::*;
-use sp_runtime::{
-	traits::{Dispatchable, TryConvert},
-	AccountId32,
-};
-use std::{collections::BTreeMap, str::FromStr};
+use pallet_rc_migrator::types::RcMigrationCheck;
 
 type RelayRuntime = polkadot_runtime::Runtime;
 type AssetHubRuntime = asset_hub_polkadot_runtime::Runtime;
@@ -52,14 +39,15 @@ impl RcMigrationCheck for MultisigStillWork {
 	fn pre_check() -> Self::RcPrePayload {
 		// We generate 100 multisigs consisting of between 1 and 10 signatories.
 		// Just use the first 1000 accs to make the generation a bit faster.
-		let accounts = frame_system::Account::<RelayRuntime>::iter()
+		// TODO @ggwpez finish
+		let _accounts = frame_system::Account::<RelayRuntime>::iter()
 			.take(1000)
 			.map(|(_id, a)| a.data)
 			.collect::<Vec<_>>();
-		let mut multisigs = Vec::new();
+		let multisigs = Vec::new();
 		//let mut rng = rand::rng();
 
-		for i in 0..100 {
+		for _i in 0..100 {
 			//let num_signatories = rng.gen_range(1..=10);
 			//let signatories = TODO @ggwpez
 		}
diff --git a/integration-tests/ahm/src/multisig_test.rs b/integration-tests/ahm/src/multisig_test.rs
index d322bbcafa..ec89d9b64a 100644
--- a/integration-tests/ahm/src/multisig_test.rs
+++ b/integration-tests/ahm/src/multisig_test.rs
@@ -26,7 +26,7 @@
 //! types directly.
 
 use crate::porting_prelude::*;
-use frame_support::{pallet_prelude::*, traits::Currency};
+use frame_support::pallet_prelude::*;
 use pallet_ah_migrator::types::AhMigrationCheck;
 use pallet_rc_migrator::types::RcMigrationCheck;
 use sp_application_crypto::Ss58Codec;
@@ -67,7 +67,7 @@ impl RcMigrationCheck for MultisigsAccountIdStaysTheSame {
 		assert!(
 			pallet_multisig::Multisigs::<RcRuntime>::contains_key(
 				multisig_info.multisig_id.clone(),
-				multisig_info.call_hash.clone()
+				multisig_info.call_hash
 			),
 			"Sample multisig {:?} should have been correctly created on the relay chain.",
 			multisig_info.multisig_id.clone().to_ss58check()
@@ -81,7 +81,7 @@ impl RcMigrationCheck for MultisigsAccountIdStaysTheSame {
 		assert!(
 			!pallet_multisig::Multisigs::<RcRuntime>::contains_key(
 				multisig_info.depositor.clone(),
-				multisig_info.call_hash.clone()
+				multisig_info.call_hash
 			),
 			"Sample multisig {:?} should have been removed from the relay chain after migration.",
 			multisig_info.multisig_id.clone().to_ss58check()
@@ -101,7 +101,7 @@ impl AhMigrationCheck for MultisigsAccountIdStaysTheSame {
 		assert!(
 			!pallet_multisig::Multisigs::<AhRuntime>::contains_key(
 				multisig_info.depositor.clone(),
-				multisig_info.call_hash.clone()
+				multisig_info.call_hash
 			),
 			"Sample multisig {:?} should not be present on Asset Hub before migration.",
 			multisig_info.multisig_id.clone().to_ss58check()
@@ -115,7 +115,7 @@ impl AhMigrationCheck for MultisigsAccountIdStaysTheSame {
 		assert!(
 			pallet_multisig::Multisigs::<AhRuntime>::contains_key(
 				multisig_info.multisig_id.clone(),
-				call_hash.clone()
+				call_hash
 			),
 			"Sample multisig {:?} should have been correctly re-created on Asset Hub.",
 			multisig_info.multisig_id.clone().to_ss58check()
@@ -123,13 +123,13 @@ impl AhMigrationCheck for MultisigsAccountIdStaysTheSame {
 		// Remove the multisig from the Asset Hub to avoid messing up with the next tests.
 		pallet_multisig::Multisigs::<AhRuntime>::remove(
 			multisig_info.multisig_id.clone(),
-			call_hash.clone(),
+			call_hash,
 		);
 		// Check that the multisig has been effectively removed
 		assert!(
 			!pallet_multisig::Multisigs::<AhRuntime>::contains_key(
 				multisig_info.multisig_id.clone(),
-				call_hash.clone()
+				call_hash
 			),
 			"Sample multisig {:?} should have been correctly removed from Asset Hub after tests.",
 			multisig_info.multisig_id.clone().to_ss58check()
diff --git a/integration-tests/ahm/src/proxy/basic_still_works.rs b/integration-tests/ahm/src/proxy/basic_still_works.rs
index ace5caa840..59bb1d238c 100644
--- a/integration-tests/ahm/src/proxy/basic_still_works.rs
+++ b/integration-tests/ahm/src/proxy/basic_still_works.rs
@@ -24,12 +24,8 @@
 //! types directly.
 
 use super::Permission;
-use crate::porting_prelude::*;
 
-use frame_support::{
-	pallet_prelude::*,
-	traits::{Currency, Defensive},
-};
+use frame_support::{pallet_prelude::*, traits::Currency};
 use frame_system::pallet_prelude::*;
 use pallet_ah_migrator::types::AhMigrationCheck;
 use pallet_rc_migrator::types::{RcMigrationCheck, ToPolkadotSs58};
@@ -105,7 +101,7 @@ impl AhMigrationCheck for ProxyBasicWorks {
 	fn pre_check(_: Self::RcPrePayload) -> Self::AhPrePayload {
 		// Not empty in this case
 		assert!(
-			!pallet_proxy::Proxies::<AssetHubRuntime>::iter().next().is_none(),
+			pallet_proxy::Proxies::<AssetHubRuntime>::iter().next().is_some(),
 			"Assert storage 'Proxy::Proxies::ah_pre::empty'"
 		);
 	}
@@ -113,15 +109,9 @@ impl AhMigrationCheck for ProxyBasicWorks {
 	fn post_check(rc_pre_payload: Self::RcPrePayload, _: Self::AhPrePayload) {
 		for ((delegatee, delegator), permissions) in rc_pre_payload.iter() {
 			// Assert storage "Proxy::Proxies::ah_post::correct"
-			let (entry, _) = pallet_proxy::Proxies::<AssetHubRuntime>::get(&delegator);
+			let (entry, _) = pallet_proxy::Proxies::<AssetHubRuntime>::get(delegator);
 			if entry.is_empty() {
-				// FIXME possibly bug
-				log::error!(
-					"Storage entry must exist for {:?} -> {:?}",
-					delegator.to_polkadot_ss58(),
-					delegatee.to_polkadot_ss58()
-				);
-				continue
+				defensive!("Storage entry must exist");
 			}
 
 			let maybe_delay =
@@ -182,17 +172,16 @@ impl ProxyBasicWorks {
 		} else {
 			assert!(
 				!Self::can_governance(delegatee, delegator, false),
-				"Only `Any`, `NonTransfer`, or `Governance` can do governance, permissions: {:?}",
-				permissions
+				"Only `Any`, `NonTransfer`, or `Governance` can do governance, permissions: {permissions:?}"
 			);
 		}
 
 		// TODO: @ggwpez add staking etc
 
 		// Alice cannot transfer
-		assert!(!Self::can_transfer(&alice, &delegator, false), "Alice cannot transfer");
+		assert!(!Self::can_transfer(&alice, delegator, false), "Alice cannot transfer");
 		// Alice cannot do governance
-		assert!(!Self::can_governance(&alice, &delegator, false), "Alice cannot do governance");
+		assert!(!Self::can_governance(&alice, delegator, false), "Alice cannot do governance");
 	}
 
 	/// Check that the `delegatee` can transfer balances on behalf of the `delegator`.
@@ -272,12 +261,12 @@ impl ProxyBasicWorks {
 	) -> <AssetHubRuntime as pallet_balances::Config>::Balance {
 		let ed = <AssetHubRuntime as pallet_balances::Config>::ExistentialDeposit::get();
 		let _ = pallet_balances::Pallet::<AssetHubRuntime>::deposit_creating(
-			&delegatee.clone().into(),
-			ed * 10000000,
+			&delegatee.clone(),
+			ed * 100_000_000_000,
 		);
 		let _ = pallet_balances::Pallet::<AssetHubRuntime>::deposit_creating(
-			&delegator.clone().into(),
-			ed * 10000000,
+			&delegator.clone(),
+			ed * 100_000_000_000,
 		);
 		ed
 	}
diff --git a/integration-tests/ahm/src/proxy/mod.rs b/integration-tests/ahm/src/proxy/mod.rs
index 78c775e8f3..907f1df991 100644
--- a/integration-tests/ahm/src/proxy/mod.rs
+++ b/integration-tests/ahm/src/proxy/mod.rs
@@ -22,19 +22,8 @@ pub use whale_watching::ProxyWhaleWatching;
 
 use crate::porting_prelude::*;
 
-use frame_support::{
-	pallet_prelude::*,
-	traits::{Currency, Defensive},
-};
-use frame_system::pallet_prelude::*;
-use hex_literal::hex;
-use pallet_ah_migrator::types::AhMigrationCheck;
-use pallet_rc_migrator::types::{RcMigrationCheck, ToPolkadotSs58};
-use sp_runtime::{
-	traits::{Dispatchable, TryConvert},
-	AccountId32,
-};
-use std::{collections::BTreeMap, str::FromStr};
+use frame_support::pallet_prelude::*;
+use sp_runtime::traits::TryConvert;
 
 /// Intent based permission.
 ///
diff --git a/integration-tests/ahm/src/proxy/whale_watching.rs b/integration-tests/ahm/src/proxy/whale_watching.rs
index e9660850f3..0433dee162 100644
--- a/integration-tests/ahm/src/proxy/whale_watching.rs
+++ b/integration-tests/ahm/src/proxy/whale_watching.rs
@@ -15,22 +15,12 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::Permission;
-use crate::porting_prelude::*;
 
 use super::ProxyBasicWorks;
-use frame_support::{
-	pallet_prelude::*,
-	traits::{Currency, Defensive},
-};
-use frame_system::pallet_prelude::*;
 use hex_literal::hex;
 use pallet_ah_migrator::types::AhMigrationCheck;
-use pallet_rc_migrator::types::{RcMigrationCheck, ToPolkadotSs58};
-use sp_runtime::{
-	traits::{Dispatchable, TryConvert},
-	AccountId32,
-};
-use std::{collections::BTreeMap, str::FromStr};
+use pallet_rc_migrator::types::RcMigrationCheck;
+use sp_runtime::{traits::TryConvert, AccountId32};
 
 type RelayRuntime = polkadot_runtime::Runtime;
 type AssetHubRuntime = asset_hub_polkadot_runtime::Runtime;
@@ -39,10 +29,10 @@ type AssetHubRuntime = asset_hub_polkadot_runtime::Runtime;
 ///
 /// We also store the number of proxies.
 const WHALES: &[(AccountId32, usize)] = &[
-	(AccountId32::new(hex!("d10577dd7d364b294d2e9a0768363ac885efb8b1c469da6c4f2141d4f6560c1f")), 7),
-	(AccountId32::new(hex!("6c1b752375304917c15af9c2e7a4426b3af513054d89f6c7bb26cd7e30e4413e")), 7),
-	(AccountId32::new(hex!("9561809d76c46eaad3f19d2d392e0a4962086ce116a8739fe7d458bdc3bd4f1d")), 6),
-	(AccountId32::new(hex!("429b067ff314c1fed75e57fcf00a6a4ff8611268e75917b5744ac8c4e1810d17")), 6),
+	(AccountId32::new(hex!("d10577dd7d364b294d2e9a0768363ac885efb8b1c469da6c4f2141d4f6560c1f")), 5),
+	(AccountId32::new(hex!("6c1b752375304917c15af9c2e7a4426b3af513054d89f6c7bb26cd7e30e4413e")), 5),
+	(AccountId32::new(hex!("9561809d76c46eaad3f19d2d392e0a4962086ce116a8739fe7d458bdc3bd4f1d")), 4),
+	(AccountId32::new(hex!("429b067ff314c1fed75e57fcf00a6a4ff8611268e75917b5744ac8c4e1810d17")), 4),
 ];
 
 const MILLION_DOT: polkadot_primitives::Balance =
@@ -68,12 +58,11 @@ impl RcMigrationCheck for ProxyWhaleWatching {
 				"Whales are rich on the relay"
 			);
 
-			let delegations = pallet_proxy::Proxies::<RelayRuntime>::get(&whale).0;
+			let delegations = pallet_proxy::Proxies::<RelayRuntime>::get(whale).0;
 			assert_eq!(
 				delegations.len(),
 				*num_proxies,
-				"Number of proxies is correct for whale {:?}",
-				whale
+				"Number of proxies is correct for whale {whale:?}"
 			);
 		}
 	}
@@ -87,7 +76,7 @@ impl AhMigrationCheck for ProxyWhaleWatching {
 
 	fn pre_check(_: Self::RcPrePayload) -> Self::AhPrePayload {}
 
-	fn post_check(rc_pre_payload: Self::RcPrePayload, _: Self::AhPrePayload) {
+	fn post_check(_rc_pre_payload: Self::RcPrePayload, _: Self::AhPrePayload) {
 		// Whales still afloat
 		for (whale, num_proxies) in WHALES {
 			let acc = frame_system::Account::<AssetHubRuntime>::get(whale);
@@ -96,7 +85,7 @@ impl AhMigrationCheck for ProxyWhaleWatching {
 				"Whales are rich on the asset hub"
 			);
 
-			let delegations = pallet_proxy::Proxies::<AssetHubRuntime>::get(&whale).0;
+			let delegations = pallet_proxy::Proxies::<AssetHubRuntime>::get(whale).0;
 			assert_eq!(delegations.len(), *num_proxies, "Number of proxies is correct");
 
 			for delegation in delegations.iter() {
diff --git a/integration-tests/ahm/src/queues_priority.rs b/integration-tests/ahm/src/queues_priority.rs
index 4e69f71c59..e949c885ec 100644
--- a/integration-tests/ahm/src/queues_priority.rs
+++ b/integration-tests/ahm/src/queues_priority.rs
@@ -108,8 +108,7 @@ fn test_force_dmp_queue_priority() {
 		<AhMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<AhRuntime>::assert_has_event(AhRuntimeEvent::AhMigrator(
-			DmpQueuePrioritySetEvent { prioritized: false, cycle_block: 12, cycle_period: 12 }
-				.into(),
+			DmpQueuePrioritySetEvent { prioritized: false, cycle_block: 12, cycle_period: 12 },
 		));
 	});
 
@@ -123,7 +122,7 @@ fn test_force_dmp_queue_priority() {
 		<AhMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<AhRuntime>::assert_has_event(AhRuntimeEvent::AhMigrator(
-			DmpQueuePrioritySetEvent { prioritized: true, cycle_block: 1, cycle_period: 12 }.into(),
+			DmpQueuePrioritySetEvent { prioritized: true, cycle_block: 1, cycle_period: 12 },
 		));
 	});
 
@@ -137,7 +136,7 @@ fn test_force_dmp_queue_priority() {
 		<AhMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<AhRuntime>::assert_has_event(AhRuntimeEvent::AhMigrator(
-			DmpQueuePrioritySetEvent { prioritized: true, cycle_block: 2, cycle_period: 12 }.into(),
+			DmpQueuePrioritySetEvent { prioritized: true, cycle_block: 2, cycle_period: 12 },
 		));
 	});
 
@@ -151,8 +150,7 @@ fn test_force_dmp_queue_priority() {
 		<AhMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<AhRuntime>::assert_has_event(AhRuntimeEvent::AhMigrator(
-			DmpQueuePrioritySetEvent { prioritized: true, cycle_block: 10, cycle_period: 12 }
-				.into(),
+			DmpQueuePrioritySetEvent { prioritized: true, cycle_block: 10, cycle_period: 12 },
 		));
 	});
 
@@ -166,8 +164,7 @@ fn test_force_dmp_queue_priority() {
 		<AhMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<AhRuntime>::assert_has_event(AhRuntimeEvent::AhMigrator(
-			DmpQueuePrioritySetEvent { prioritized: false, cycle_block: 11, cycle_period: 12 }
-				.into(),
+			DmpQueuePrioritySetEvent { prioritized: false, cycle_block: 11, cycle_period: 12 },
 		));
 	});
 
@@ -181,8 +178,7 @@ fn test_force_dmp_queue_priority() {
 		<AhMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<AhRuntime>::assert_has_event(AhRuntimeEvent::AhMigrator(
-			DmpQueuePrioritySetEvent { prioritized: false, cycle_block: 12, cycle_period: 12 }
-				.into(),
+			DmpQueuePrioritySetEvent { prioritized: false, cycle_block: 12, cycle_period: 12 },
 		));
 	});
 
@@ -196,7 +192,7 @@ fn test_force_dmp_queue_priority() {
 		<AhMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<AhRuntime>::assert_has_event(AhRuntimeEvent::AhMigrator(
-			DmpQueuePrioritySetEvent { prioritized: true, cycle_block: 1, cycle_period: 12 }.into(),
+			DmpQueuePrioritySetEvent { prioritized: true, cycle_block: 1, cycle_period: 12 },
 		));
 	});
 }
@@ -276,8 +272,7 @@ fn test_force_ah_ump_queue_priority() {
 		<RcMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<RcRuntime>::assert_has_event(RcRuntimeEvent::RcMigrator(
-			AhUmpQueuePrioritySetEvent { prioritized: false, cycle_block: 12, cycle_period: 12 }
-				.into(),
+			AhUmpQueuePrioritySetEvent { prioritized: false, cycle_block: 12, cycle_period: 12 },
 		));
 	});
 
@@ -291,8 +286,7 @@ fn test_force_ah_ump_queue_priority() {
 		<RcMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<RcRuntime>::assert_has_event(RcRuntimeEvent::RcMigrator(
-			AhUmpQueuePrioritySetEvent { prioritized: true, cycle_block: 1, cycle_period: 12 }
-				.into(),
+			AhUmpQueuePrioritySetEvent { prioritized: true, cycle_block: 1, cycle_period: 12 },
 		));
 	});
 
@@ -306,8 +300,7 @@ fn test_force_ah_ump_queue_priority() {
 		<RcMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<RcRuntime>::assert_has_event(RcRuntimeEvent::RcMigrator(
-			AhUmpQueuePrioritySetEvent { prioritized: true, cycle_block: 2, cycle_period: 12 }
-				.into(),
+			AhUmpQueuePrioritySetEvent { prioritized: true, cycle_block: 2, cycle_period: 12 },
 		));
 	});
 
@@ -321,8 +314,7 @@ fn test_force_ah_ump_queue_priority() {
 		<RcMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<RcRuntime>::assert_has_event(RcRuntimeEvent::RcMigrator(
-			AhUmpQueuePrioritySetEvent { prioritized: true, cycle_block: 10, cycle_period: 12 }
-				.into(),
+			AhUmpQueuePrioritySetEvent { prioritized: true, cycle_block: 10, cycle_period: 12 },
 		));
 	});
 
@@ -336,8 +328,7 @@ fn test_force_ah_ump_queue_priority() {
 		<RcMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<RcRuntime>::assert_has_event(RcRuntimeEvent::RcMigrator(
-			AhUmpQueuePrioritySetEvent { prioritized: false, cycle_block: 11, cycle_period: 12 }
-				.into(),
+			AhUmpQueuePrioritySetEvent { prioritized: false, cycle_block: 11, cycle_period: 12 },
 		));
 	});
 
@@ -351,8 +342,7 @@ fn test_force_ah_ump_queue_priority() {
 		<RcMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<RcRuntime>::assert_has_event(RcRuntimeEvent::RcMigrator(
-			AhUmpQueuePrioritySetEvent { prioritized: false, cycle_block: 12, cycle_period: 12 }
-				.into(),
+			AhUmpQueuePrioritySetEvent { prioritized: false, cycle_block: 12, cycle_period: 12 },
 		));
 	});
 
@@ -366,8 +356,7 @@ fn test_force_ah_ump_queue_priority() {
 		<RcMigrator as OnFinalize<_>>::on_finalize(now);
 
 		frame_system::Pallet::<RcRuntime>::assert_has_event(RcRuntimeEvent::RcMigrator(
-			AhUmpQueuePrioritySetEvent { prioritized: true, cycle_block: 1, cycle_period: 12 }
-				.into(),
+			AhUmpQueuePrioritySetEvent { prioritized: true, cycle_block: 1, cycle_period: 12 },
 		));
 	});
 }
diff --git a/integration-tests/ahm/src/tests.rs b/integration-tests/ahm/src/tests.rs
index 23e0561e5b..e3e9d31ce4 100644
--- a/integration-tests/ahm/src/tests.rs
+++ b/integration-tests/ahm/src/tests.rs
@@ -43,17 +43,14 @@ use super::{
 };
 use asset_hub_polkadot_runtime::Runtime as AssetHub;
 use cumulus_pallet_parachain_system::PendingUpwardMessages;
-use cumulus_primitives_core::{BlockT, InboundDownwardMessage, Junction, Location, ParaId};
-use frame_support::{
-	assert_err,
-	traits::{
-		fungible::Inspect, schedule::DispatchTime, Currency, ExistenceRequirement, OnFinalize,
-		OnInitialize, ReservableCurrency,
-	},
+use cumulus_primitives_core::{InboundDownwardMessage, Junction, Location, ParaId};
+use frame_support::traits::{
+	fungible::Inspect, schedule::DispatchTime, Currency, ExistenceRequirement, OnFinalize,
+	OnInitialize, ReservableCurrency,
 };
 use frame_system::pallet_prelude::BlockNumberFor;
 use pallet_ah_migrator::{
-	proxy::ProxyBasicChecks, types::AhMigrationCheck, AhMigrationStage as AhMigrationStageStorage,
+	types::AhMigrationCheck, AhMigrationStage as AhMigrationStageStorage,
 	MigrationStage as AhMigrationStage,
 };
 use pallet_rc_migrator::{
@@ -181,7 +178,7 @@ async fn pallet_migration_works() {
 	set_initial_migration_stage(&mut rc, None);
 
 	// Pre-checks on the Relay
-	let rc_pre = run_check(|| RcChecks::pre_check(), &mut rc);
+	let rc_pre = run_check(RcChecks::pre_check, &mut rc);
 
 	// Pre-checks on the Asset Hub
 	let ah_pre = run_check(|| AhChecks::pre_check(rc_pre.clone().unwrap()), &mut ah);
@@ -218,7 +215,7 @@ async fn pallet_migration_works() {
 
 fn run_check<R>(f: impl FnOnce() -> R, ext: &mut TestExternalities) -> Option<R> {
 	if std::env::var("START_STAGE").is_err() {
-		Some(ext.execute_with(|| f()))
+		Some(ext.execute_with(f))
 	} else {
 		None
 	}
@@ -326,10 +323,10 @@ async fn print_sovereign_account_translation() {
 				pallet_ah_ops::Pallet::<AssetHub>::try_translate_rc_sovereign_to_ah(&account);
 
 			if let Ok((ah_acc, para_id)) = translated {
-				if !rc_to_ah.contains_key(&account) {
-					println!("Account belongs to an unregistered para {}: {}", para_id, account);
-					rc_to_ah.insert(account, (ah_acc, para_id));
-				}
+				rc_to_ah.entry(account.clone()).or_insert_with(|| {
+					println!("Account belongs to an unregistered para {para_id}: {account}");
+					(ah_acc, para_id)
+				});
 			}
 		}
 	});
@@ -340,9 +337,9 @@ async fn print_sovereign_account_translation() {
 	println!("Translating {} RC accounts to AH", rc_to_ah.len());
 	ah.execute_with(|| {
 		for (rc_acc, (ah_acc, para_id)) in rc_to_ah.iter() {
-			println!("[{}] {} -> {}", para_id, rc_acc, ah_acc);
+			println!("[{para_id}] {rc_acc} -> {ah_acc}");
 
-			csv.push_str(&format!("{},{},{}\n", para_id, rc_acc, ah_acc));
+			csv.push_str(&format!("{para_id},{rc_acc},{ah_acc}\n"));
 		}
 	});
 
@@ -384,7 +381,7 @@ async fn print_accounts_statistics() {
 		total_count ~ 1_434_995
 		total_liquid_count ~ 1_373_890
 	 */
-	println!("Total counts: {:?}", total_counts);
+	println!("Total counts: {total_counts:?}");
 }
 
 #[test]
@@ -395,14 +392,14 @@ fn ah_account_migration_weight() {
 	let ms_for_accs = |num_accs: u32| {
 		let weight =
 			pallet_rc_migrator::weights_ah::SubstrateWeight::<AssetHub>::receive_liquid_accounts(
-				num_accs as u32,
+				num_accs,
 			);
 		weight.ref_time() as f64 / WEIGHT_REF_TIME_PER_MILLIS as f64
 	};
 	let mb_for_accs = |num_accs: u32| {
 		let weight =
 			pallet_rc_migrator::weights_ah::SubstrateWeight::<AssetHub>::receive_liquid_accounts(
-				num_accs as u32,
+				num_accs,
 			);
 		weight.proof_size() as f64 / 1_000_000.0
 	};
@@ -410,7 +407,7 @@ fn ah_account_migration_weight() {
 	// Print for 10, 100 and 1000 accounts in ms
 	for i in [10, 100, 486, 1000] {
 		let (ms, mb) = (ms_for_accs(i), mb_for_accs(i));
-		println!("Weight for {} accounts: {: >4.2} ms, {: >4.2} MB", i, ms, mb);
+		println!("Weight for {i} accounts: {ms: >4.2} ms, {mb: >4.2} MB");
 
 		assert!(ms < 200.0, "Ref time weight for Accounts migration is insane");
 		assert!(mb < 4.0, "Proof size for Accounts migration is insane");
@@ -435,7 +432,7 @@ async fn migration_works_time() {
 			vec![].into();
 
 		// finish the loop when the migration is done.
-		while ah.execute_with(|| AhMigrationStageStorage::<AssetHub>::get()) !=
+		while ah.execute_with(AhMigrationStageStorage::<AssetHub>::get) !=
 			AhMigrationStage::MigrationDone
 		{
 			// with async backing having three unincluded segments, we expect the Asset Hub block
@@ -503,20 +500,20 @@ async fn migration_works_time() {
 	set_initial_migration_stage(&mut rc, None);
 
 	// Pre-checks on the Relay
-	let rc_pre = run_check(|| RcChecks::pre_check(), &mut rc);
+	let rc_pre = run_check(RcChecks::pre_check, &mut rc);
 
 	// Pre-checks on the Asset Hub
 	let ah_pre = run_check(|| AhChecks::pre_check(rc_pre.clone().unwrap()), &mut ah);
 
-	let rc_block_start = rc.execute_with(|| frame_system::Pallet::<Polkadot>::block_number());
-	let ah_block_start = ah.execute_with(|| frame_system::Pallet::<AssetHub>::block_number());
+	let rc_block_start = rc.execute_with(frame_system::Pallet::<Polkadot>::block_number);
+	let ah_block_start = ah.execute_with(frame_system::Pallet::<AssetHub>::block_number);
 
 	log::info!("Running the migration first time");
 
 	migrate(ah_block_start, &mut rc, &mut ah);
 
-	let rc_block_end = rc.execute_with(|| frame_system::Pallet::<Polkadot>::block_number());
-	let ah_block_end = ah.execute_with(|| frame_system::Pallet::<AssetHub>::block_number());
+	let rc_block_end = rc.execute_with(frame_system::Pallet::<Polkadot>::block_number);
+	let ah_block_end = ah.execute_with(frame_system::Pallet::<AssetHub>::block_number);
 
 	// Post-checks on the Relay
 	run_check(|| RcChecks::post_check(rc_pre.clone().unwrap()), &mut rc);
@@ -541,7 +538,7 @@ async fn migration_works_time() {
 		AhMigrationStageStorage::<AssetHub>::put(AhMigrationStage::DataMigrationOngoing);
 	});
 
-	let ah_block_start = ah.execute_with(|| frame_system::Pallet::<AssetHub>::block_number());
+	let ah_block_start = ah.execute_with(frame_system::Pallet::<AssetHub>::block_number);
 
 	log::info!("Running the migration second time");
 
@@ -584,8 +581,8 @@ async fn scheduled_migration_works() {
 	});
 	ah.commit_all().unwrap();
 
-	let mut start = 0u32.into();
-	let mut cool_off_end = 0u32.into();
+	let mut start = 0u32;
+	let mut cool_off_end = 0u32;
 
 	// Schedule the migration on RC.
 	let dmp_messages = rc.execute_with(|| {
@@ -630,14 +627,14 @@ async fn scheduled_migration_works() {
 			RcMigrationStage::WaitingForAh { cool_off_end }
 		);
 		let dmp_messages = DownwardMessageQueues::<Polkadot>::take(AH_PARA_ID);
-		assert!(dmp_messages.len() > 0);
+		assert!(!dmp_messages.is_empty());
 
 		dmp_messages
 	});
 
 	// enqueue DMP messages from RC to AH.
 	ah.execute_with(|| {
-		enqueue_dmp((dmp_messages, 0u32.into()));
+		enqueue_dmp((dmp_messages, 0u32));
 	});
 	ah.commit_all().unwrap();
 
@@ -660,7 +657,7 @@ async fn scheduled_migration_works() {
 
 	// enqueue UMP messages from AH to RC.
 	rc.execute_with(|| {
-		enqueue_ump((ump_messages, 0u32.into()));
+		enqueue_ump((ump_messages, 0u32));
 	});
 	rc.commit_all().unwrap();
 
@@ -731,7 +728,7 @@ async fn some_account_migration_works() {
 		let maybe_withdrawn_account = rc.execute_with(|| {
 			let rc_account = SystemAccount::<Polkadot>::get(&account_id);
 			log::info!("Migrating account id: {:?}", account_id.to_ss58check());
-			log::info!("RC account info: {:?}", rc_account);
+			log::info!("RC account info: {rc_account:?}");
 
 			let maybe_withdrawn_account = AccountsMigrator::<Polkadot>::withdraw_account(
 				account_id,
@@ -740,7 +737,7 @@ async fn some_account_migration_works() {
 				0,
 			)
 			.unwrap_or_else(|err| {
-				log::error!("Account withdrawal failed: {:?}", err);
+				log::error!("Account withdrawal failed: {err:?}");
 				None
 			});
 
@@ -755,7 +752,7 @@ async fn some_account_migration_works() {
 			},
 		};
 
-		log::info!("Withdrawn account: {:?}", withdrawn_account);
+		log::info!("Withdrawn account: {withdrawn_account:?}");
 
 		ah.execute_with(|| {
 			use asset_hub_polkadot_runtime::AhMigrator;
@@ -764,7 +761,7 @@ async fn some_account_migration_works() {
 			let encoded_account = withdrawn_account.encode();
 			let account = Decode::decode(&mut &encoded_account[..]).unwrap();
 			let res = AhMigrator::do_receive_account(account);
-			log::info!("Account integration result: {:?}", res);
+			log::info!("Account integration result: {res:?}");
 		});
 	}
 }
@@ -794,7 +791,7 @@ fn test_account_references() {
 		assert_eq!(PalletSystem::providers(&who), 1);
 
 		// reserve some balance which results `+1` consumer reference.
-		let _ = PalletBalances::reserve(&who, ed).expect("reserve failed");
+		PalletBalances::reserve(&who, ed).expect("reserve failed");
 
 		// account data is valid.
 		assert_eq!(PalletBalances::balance(&who), ed + ed);
@@ -815,7 +812,7 @@ fn test_account_references() {
 		// consumer reference to automatically correct the consumer reference since the reserve
 		// is still there.
 		let who2: AccountId32 = [1; 32].into();
-		let _ = PalletBalances::transfer(&who, &who2, ed, ExistenceRequirement::AllowDeath)
+		PalletBalances::transfer(&who, &who2, ed, ExistenceRequirement::AllowDeath)
 			.expect("transfer failed");
 
 		// account is still alive, and consumer reference is corrected.
@@ -875,7 +872,7 @@ fn test_control_flow() {
 
 	// prepare the RC to send XCM messages to AH and Collectives.
 	rc.execute_with(|| {
-		rc_now = rc_now + 1;
+		rc_now += 1;
 		frame_system::Pallet::<RcRuntime>::reset_events();
 		frame_system::Pallet::<RcRuntime>::set_block_number(rc_now);
 
@@ -899,7 +896,7 @@ fn test_control_flow() {
 
 	// prepare the AH to send XCM messages to RC and Collectives.
 	ah.execute_with(|| {
-		ah_now = ah_now + 1;
+		ah_now += 1;
 		frame_system::Pallet::<AhRuntime>::reset_events();
 		frame_system::Pallet::<AhRuntime>::set_block_number(ah_now);
 
@@ -920,7 +917,7 @@ fn test_control_flow() {
 
 	// send invalid XCM message from RC to AH via rc-migrator.
 	let dmp_messages = rc.execute_with(|| {
-		rc_now = rc_now + 1;
+		rc_now += 1;
 		frame_system::Pallet::<RcRuntime>::reset_events();
 		frame_system::Pallet::<RcRuntime>::set_block_number(rc_now);
 
@@ -950,11 +947,11 @@ fn test_control_flow() {
 
 	// process the message in the AH.
 	let ump_messages = ah.execute_with(|| {
-		ah_now = ah_now + 1;
+		ah_now += 1;
 		frame_system::Pallet::<AhRuntime>::reset_events();
 		frame_system::Pallet::<AhRuntime>::set_block_number(ah_now);
 
-		enqueue_dmp((dmp_messages, 0u32.into()));
+		enqueue_dmp((dmp_messages, 0u32));
 
 		<asset_hub_polkadot_runtime::MessageQueue as OnInitialize<_>>::on_initialize(ah_now);
 		<asset_hub_polkadot_runtime::MessageQueue as OnFinalize<_>>::on_finalize(ah_now);
@@ -968,11 +965,11 @@ fn test_control_flow() {
 
 	// process the acknowledgement message from AH in the RC.
 	rc.execute_with(|| {
-		rc_now = rc_now + 1;
+		rc_now += 1;
 		frame_system::Pallet::<RcRuntime>::reset_events();
 		frame_system::Pallet::<RcRuntime>::set_block_number(rc_now);
 
-		enqueue_ump((ump_messages, 0u32.into()));
+		enqueue_ump((ump_messages, 0u32));
 
 		<polkadot_runtime::MessageQueue as OnInitialize<_>>::on_initialize(rc_now);
 		<polkadot_runtime::MessageQueue as OnFinalize<_>>::on_finalize(rc_now);
@@ -984,7 +981,7 @@ fn test_control_flow() {
 
 		// RC migrator has received the response from the AH indicating that the message failed to
 		// be processed.
-		assert!(frame_system::Pallet::<Polkadot>::events().first().map_or(false, |record| {
+		assert!(frame_system::Pallet::<Polkadot>::events().first().is_some_and(|record| {
 			match &record.event {
 				RcRuntimeEvent::RcMigrator(pallet_rc_migrator::Event::QueryResponseReceived {
 					query_id,
@@ -1000,7 +997,7 @@ fn test_control_flow() {
 
 	// send valid XCM message from RC to AH via rc-migrator.
 	let dmp_messages = rc.execute_with(|| {
-		rc_now = rc_now + 1;
+		rc_now += 1;
 		frame_system::Pallet::<RcRuntime>::reset_events();
 		frame_system::Pallet::<RcRuntime>::set_block_number(rc_now);
 
@@ -1051,11 +1048,11 @@ fn test_control_flow() {
 
 	// process the message in the AH.
 	let ump_messages = ah.execute_with(|| {
-		ah_now = ah_now + 1;
+		ah_now += 1;
 		frame_system::Pallet::<AhRuntime>::reset_events();
 		frame_system::Pallet::<AhRuntime>::set_block_number(ah_now);
 
-		enqueue_dmp((dmp_messages, 0u32.into()));
+		enqueue_dmp((dmp_messages, 0u32));
 
 		<asset_hub_polkadot_runtime::MessageQueue as OnInitialize<_>>::on_initialize(ah_now);
 		<asset_hub_polkadot_runtime::MessageQueue as OnFinalize<_>>::on_finalize(ah_now);
@@ -1069,18 +1066,18 @@ fn test_control_flow() {
 
 	// process the acknowledgement message from AH in the RC.
 	rc.execute_with(|| {
-		rc_now = rc_now + 1;
+		rc_now += 1;
 		frame_system::Pallet::<RcRuntime>::reset_events();
 		frame_system::Pallet::<RcRuntime>::set_block_number(rc_now);
 
-		enqueue_ump((ump_messages, 0u32.into()));
+		enqueue_ump((ump_messages, 0u32));
 
 		<polkadot_runtime::MessageQueue as OnInitialize<_>>::on_initialize(rc_now);
 		<polkadot_runtime::MessageQueue as OnFinalize<_>>::on_finalize(rc_now);
 
 		// RC migrator has received the response from the AH indicating that the message was
 		// successfully processed.
-		assert!(frame_system::Pallet::<Polkadot>::events().first().map_or(false, |record| {
+		assert!(frame_system::Pallet::<Polkadot>::events().first().is_some_and(|record| {
 			match &record.event {
 				RcRuntimeEvent::RcMigrator(pallet_rc_migrator::Event::QueryResponseReceived {
 					query_id,
diff --git a/integration-tests/zombienet/tests/smoke.rs b/integration-tests/zombienet/tests/smoke.rs
index 8aa37a3f26..75f5536d90 100644
--- a/integration-tests/zombienet/tests/smoke.rs
+++ b/integration-tests/zombienet/tests/smoke.rs
@@ -7,7 +7,7 @@ use zombienet_sdk_tests::{
 
 fn dump_provider_and_versions() {
 	let provider = get_provider_from_env();
-	log::info!("Using zombienet provider: {:?}", provider);
+	log::info!("Using zombienet provider: {provider:?}");
 
 	if let Provider::Docker = provider {
 		let images = get_images_from_env();
diff --git a/pallets/ah-migrator/src/account.rs b/pallets/ah-migrator/src/account.rs
index 933a76ff44..8458ca64ee 100644
--- a/pallets/ah-migrator/src/account.rs
+++ b/pallets/ah-migrator/src/account.rs
@@ -254,7 +254,7 @@ pub mod tests {
 		// i.e., the mapping of AH hold ids to hold amounts, the reserved balance and the free
 		// balance on Asset Hub before migration.
 		type RcPrePayload = (BTreeMap<T::AccountId, BalanceSummary>, u128);
-		type AhPrePayload = (BTreeMap<T::AccountId, (BTreeMap<Vec<u8>, u128>, u128, u128)>);
+		type AhPrePayload = BTreeMap<T::AccountId, (BTreeMap<Vec<u8>, u128>, u128, u128)>;
 
 		/// Run some checks on asset hub before the migration and store intermediate payload.
 		///
diff --git a/pallets/ah-migrator/src/benchmarking.rs b/pallets/ah-migrator/src/benchmarking.rs
index 9335affb71..3cdaea3cce 100644
--- a/pallets/ah-migrator/src/benchmarking.rs
+++ b/pallets/ah-migrator/src/benchmarking.rs
@@ -42,7 +42,7 @@ use pallet_rc_migrator::{
 	scheduler::RcSchedulerMessage,
 	staking::{
 		bags_list::alias::Node,
-		delegated_staking::RcDelegatedStakingMessage,
+		delegated_staking::PortableDelegatedStakingMessage,
 		nom_pools_alias::{SubPools, UnbondPool},
 	},
 	treasury::{alias::SpendStatus, RcTreasuryMessage},
@@ -52,7 +52,7 @@ use pallet_referenda::{Deposit, ReferendumInfo, ReferendumStatus, TallyOf, Track
 use pallet_treasury::PaymentState;
 use scheduler::RcScheduledOf;
 use sp_runtime::traits::Hash;
-use xcm::v4::{Junction, Location};
+use xcm::v4::Location;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
@@ -765,8 +765,8 @@ pub mod benchmarks {
 
 	#[benchmark]
 	fn receive_delegated_staking_messages(n: Linear<1, 255>) {
-		let create_delegated_staking = |n: u8| -> RcDelegatedStakingMessageOf<T> {
-			RcDelegatedStakingMessage::Agents {
+		let create_delegated_staking = |n: u8| -> PortableDelegatedStakingMessage {
+			PortableDelegatedStakingMessage::Agents {
 				agent: [n; 32].into(),
 				payee: [n; 32].into(),
 				total_delegated: n.into(),
diff --git a/pallets/ah-migrator/src/crowdloan.rs b/pallets/ah-migrator/src/crowdloan.rs
index b8cf704d8d..f94bfb1409 100644
--- a/pallets/ah-migrator/src/crowdloan.rs
+++ b/pallets/ah-migrator/src/crowdloan.rs
@@ -229,9 +229,12 @@ impl<T: Config> crate::types::AhMigrationCheck for CrowdloanMigrator<T> {
 		// - storage_iter: Iterator over storage items
 		// - error_msg: Custom error message for assertion failure
 		fn verify_reserves<T: Config, I>(
-			reserves_pre: &BTreeMap<ParaId, Vec<(BlockNumberFor<T>, AccountIdOf<T>, BalanceOf<T>)>>,
+			_reserves_pre: &BTreeMap<
+				ParaId,
+				Vec<(BlockNumberFor<T>, AccountIdOf<T>, BalanceOf<T>)>,
+			>,
 			storage_iter: I,
-			error_msg: &str,
+			_error_msg: &str,
 		) where
 			I: Iterator<Item = ((BlockNumberFor<T>, ParaId, AccountIdOf<T>), BalanceOf<T>)>,
 		{
diff --git a/pallets/ah-migrator/src/lib.rs b/pallets/ah-migrator/src/lib.rs
index 160cc7a4a1..5baefdf5ad 100644
--- a/pallets/ah-migrator/src/lib.rs
+++ b/pallets/ah-migrator/src/lib.rs
@@ -95,8 +95,8 @@ use pallet_rc_migrator::{
 	preimage::*,
 	proxy::*,
 	staking::{
-		bags_list::RcBagsListMessage, delegated_staking::RcDelegatedStakingMessageOf,
-		fast_unstake::RcFastUnstakeMessage, nom_pools::*, *,
+		bags_list::RcBagsListMessage, delegated_staking::PortableDelegatedStakingMessage,
+		fast_unstake::RcFastUnstakeMessage, nom_pools::*,
 	},
 	types::MigrationFinishedData,
 	vesting::RcVestingSchedule,
@@ -268,7 +268,7 @@ pub mod pallet {
 		+ pallet_bounties::Config
 		+ pallet_child_bounties::Config
 		+ pallet_treasury::Config<Currency = pallet_balances::Pallet<Self>>
-		+ pallet_delegated_staking::Config
+		+ pallet_delegated_staking::Config<Currency = pallet_balances::Pallet<Self>>
 		+ pallet_staking_async::Config<CurrencyBalance = u128>
 	{
 		type RuntimeHoldReason: Parameter
@@ -855,7 +855,7 @@ pub mod pallet {
 		#[pallet::weight(T::AhWeightInfo::receive_delegated_staking_messages(messages.len() as u32))]
 		pub fn receive_delegated_staking_messages(
 			origin: OriginFor<T>,
-			messages: Vec<RcDelegatedStakingMessageOf<T>>,
+			messages: Vec<PortableDelegatedStakingMessage>,
 		) -> DispatchResult {
 			ensure_root(origin)?;
 
diff --git a/pallets/ah-migrator/src/referenda.rs b/pallets/ah-migrator/src/referenda.rs
index 5660961457..2480bf69f2 100644
--- a/pallets/ah-migrator/src/referenda.rs
+++ b/pallets/ah-migrator/src/referenda.rs
@@ -16,7 +16,7 @@
 
 use crate::*;
 use call::BoundedCallOf;
-use frame_support::traits::{schedule::v3::Anon, DefensiveTruncateFrom};
+use frame_support::traits::DefensiveTruncateFrom;
 use pallet_rc_migrator::referenda::ReferendaMigrator;
 use pallet_referenda::{
 	BalanceOf, DecidingCount, MetadataOf, ReferendumCount, ReferendumIndex, ReferendumInfo,
diff --git a/pallets/ah-migrator/src/staking/checks.rs b/pallets/ah-migrator/src/staking/checks.rs
index b616120e51..f93879611b 100644
--- a/pallets/ah-migrator/src/staking/checks.rs
+++ b/pallets/ah-migrator/src/staking/checks.rs
@@ -16,12 +16,9 @@
 
 //! Checks that the staking migration succeeded.
 
-use pallet_rc_migrator::{
-	staking::{
-		message::{PortableNominations, PortableUnappliedSlash},
-		PortableStakingMessage, RcData,
-	},
-	types::IntoPortable,
+use pallet_rc_migrator::staking::{
+	message::{PortableNominations, PortableUnappliedSlash},
+	RcData,
 };
 use sp_runtime::{AccountId32, Perbill};
 
@@ -141,6 +138,7 @@ impl<T: crate::Config> crate::types::AhMigrationCheck
 	}
 }
 
+#[allow(deprecated)]
 fn translate_reward_destination(
 	destination: pallet_staking::RewardDestination<AccountId32>,
 ) -> pallet_staking_async::RewardDestination<AccountId32> {
diff --git a/pallets/ah-migrator/src/staking/delegated_staking.rs b/pallets/ah-migrator/src/staking/delegated_staking.rs
index cc8717e1c3..5f882c2c8d 100644
--- a/pallets/ah-migrator/src/staking/delegated_staking.rs
+++ b/pallets/ah-migrator/src/staking/delegated_staking.rs
@@ -16,28 +16,27 @@
 
 use crate::*;
 use pallet_rc_migrator::staking::delegated_staking::{
-	alias as delegated_staking_alias, test, DelegatedStakingMigrator, RcDelegatedStakingMessage,
-	RcDelegatedStakingMessageOf,
+	test, DelegatedStakingMigrator, PortableDelegatedStakingMessage,
 };
 
 impl<T: Config> Pallet<T> {
 	pub fn translate_delegated_staking_message(
-		message: RcDelegatedStakingMessageOf<T>,
-	) -> RcDelegatedStakingMessageOf<T> {
+		message: PortableDelegatedStakingMessage,
+	) -> PortableDelegatedStakingMessage {
 		match message {
-			RcDelegatedStakingMessage::Delegators { delegator, agent, amount } =>
-				RcDelegatedStakingMessage::Delegators {
+			PortableDelegatedStakingMessage::Delegators { delegator, agent, amount } =>
+				PortableDelegatedStakingMessage::Delegators {
 					delegator: Self::translate_account_rc_to_ah(delegator),
 					agent: Self::translate_account_rc_to_ah(agent),
 					amount,
 				},
-			RcDelegatedStakingMessage::Agents {
+			PortableDelegatedStakingMessage::Agents {
 				agent,
 				payee,
 				total_delegated,
 				unclaimed_withdrawals,
 				pending_slash,
-			} => RcDelegatedStakingMessage::Agents {
+			} => PortableDelegatedStakingMessage::Agents {
 				agent: Self::translate_account_rc_to_ah(agent),
 				payee: Self::translate_account_rc_to_ah(payee),
 				total_delegated,
@@ -48,7 +47,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	pub fn do_receive_delegated_staking_messages(
-		messages: Vec<RcDelegatedStakingMessageOf<T>>,
+		messages: Vec<PortableDelegatedStakingMessage>,
 	) -> DispatchResult {
 		log::info!(target: LOG_TARGET, "Processing {} delegated staking messages", messages.len());
 		Self::deposit_event(Event::BatchReceived {
@@ -77,29 +76,29 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn do_process_delegated_staking_message(
-		message: RcDelegatedStakingMessageOf<T>,
+		message: PortableDelegatedStakingMessage,
 	) -> Result<(), Error<T>> {
 		log::debug!(target: LOG_TARGET, "Processing delegated staking message: {:?}", message);
 
 		match message {
-			RcDelegatedStakingMessage::Delegators { delegator, agent, amount } => {
-				let delegation = delegated_staking_alias::Delegation { agent, amount };
-				delegated_staking_alias::Delegations::<T>::insert(delegator, delegation);
+			PortableDelegatedStakingMessage::Delegators { delegator, agent, amount } => {
+				let delegation = pallet_delegated_staking::types::Delegation { agent, amount };
+				pallet_delegated_staking::Delegators::<T>::insert(delegator, delegation);
 			},
-			RcDelegatedStakingMessage::Agents {
+			PortableDelegatedStakingMessage::Agents {
 				agent,
 				payee,
 				total_delegated,
 				unclaimed_withdrawals,
 				pending_slash,
 			} => {
-				let agent_ledger = delegated_staking_alias::AgentLedger {
+				let agent_ledger = pallet_delegated_staking::types::AgentLedger {
 					payee,
 					total_delegated,
 					unclaimed_withdrawals,
 					pending_slash,
 				};
-				delegated_staking_alias::AgentLedgers::<T>::insert(agent, agent_ledger);
+				pallet_delegated_staking::Agents::<T>::insert(agent, agent_ledger);
 			},
 		}
 
@@ -114,13 +113,13 @@ impl<T: Config> crate::types::AhMigrationCheck for DelegatedStakingMigrator<T> {
 	fn pre_check(_: Self::RcPrePayload) -> Self::AhPrePayload {
 		// Assert storage "Delegations::ah_pre::empty"
 		assert!(
-			delegated_staking_alias::Delegations::<T>::iter().next().is_none(),
+			pallet_delegated_staking::Delegators::<T>::iter().next().is_none(),
 			"No delegations should exist on the Asset Hub before migration"
 		);
 
-		// Assert storage "AgentLedgers::ah_pre::empty"
+		// Assert storage "Agents::ah_pre::empty"
 		assert!(
-			delegated_staking_alias::AgentLedgers::<T>::iter().next().is_none(),
+			pallet_delegated_staking::Agents::<T>::iter().next().is_none(),
 			"No agent ledgers should exist on the Asset Hub before migration"
 		);
 	}
@@ -131,14 +130,14 @@ impl<T: Config> crate::types::AhMigrationCheck for DelegatedStakingMigrator<T> {
 		// Assert storage "Delegations::ah_post::correct"
 		assert_eq!(
 			delegations.len(),
-			delegated_staking_alias::Delegations::<T>::iter().count(),
+			pallet_delegated_staking::Delegators::<T>::iter().count(),
 			"Number of delegations on Asset Hub after migration should be the same as on the Relay Chain before migration"
 		);
 
-		// Assert storage "AgentLedgers::ah_post::correct"
+		// Assert storage "Agents::ah_post::correct"
 		assert_eq!(
 			agent_ledgers.len(),
-			delegated_staking_alias::AgentLedgers::<T>::iter().count(),
+			pallet_delegated_staking::Agents::<T>::iter().count(),
 			"Number of agent ledgers on Asset Hub after migration should be the same as on the Relay Chain before migration"
 		);
 
@@ -150,7 +149,7 @@ impl<T: Config> crate::types::AhMigrationCheck for DelegatedStakingMigrator<T> {
 				Pallet::<T>::translate_account_rc_to_ah(delegation.agent.clone());
 
 			let ah_delegation_maybe =
-				delegated_staking_alias::Delegations::<T>::get(&translated_delegator);
+				pallet_delegated_staking::Delegators::<T>::get(&translated_delegator);
 			assert!(
 				ah_delegation_maybe.is_some(),
 				"Delegation for delegator {:?} should exist on the Asset Hub after migration",
@@ -171,7 +170,7 @@ impl<T: Config> crate::types::AhMigrationCheck for DelegatedStakingMigrator<T> {
 			);
 		}
 
-		// Assert storage "AgentLedgers::ah_post::correct"
+		// Assert storage "Agents::ah_post::correct"
 		for agent_ledger in agent_ledgers {
 			let translated_agent =
 				Pallet::<T>::translate_account_rc_to_ah(agent_ledger.agent.clone());
@@ -179,7 +178,7 @@ impl<T: Config> crate::types::AhMigrationCheck for DelegatedStakingMigrator<T> {
 				Pallet::<T>::translate_account_rc_to_ah(agent_ledger.payee.clone());
 
 			let ah_agent_ledger_maybe =
-				delegated_staking_alias::AgentLedgers::<T>::get(&translated_agent);
+				pallet_delegated_staking::Agents::<T>::get(&translated_agent);
 			assert!(
 				ah_agent_ledger_maybe.is_some(),
 				"Agent ledger for agent {:?} should exist on the Asset Hub after migration",
diff --git a/pallets/ah-migrator/src/xcm_config.rs b/pallets/ah-migrator/src/xcm_config.rs
index a66e66304b..db885f024e 100644
--- a/pallets/ah-migrator/src/xcm_config.rs
+++ b/pallets/ah-migrator/src/xcm_config.rs
@@ -30,7 +30,6 @@ use xcm::latest::prelude::*;
 use xcm_builder::{AllowExplicitUnpaidExecutionFrom, IsSiblingSystemParachain};
 use xcm_executor::traits::{Properties, ShouldExecute};
 
-#[cfg(not(feature = "ahm-kusama"))]
 use polkadot_runtime_constants::system_parachain;
 
 pub mod common {
@@ -146,9 +145,6 @@ mod before {
 		*,
 	};
 
-	#[cfg(feature = "ahm-kusama")]
-	use kusama_runtime_constants::TREASURY_PALLET_ID;
-	#[cfg(not(feature = "ahm-kusama"))]
 	use polkadot_runtime_constants::TREASURY_PALLET_ID;
 
 	parameter_types! {
diff --git a/pallets/ah-ops/src/lib.rs b/pallets/ah-ops/src/lib.rs
index 2796d7e8ae..909c994733 100644
--- a/pallets/ah-ops/src/lib.rs
+++ b/pallets/ah-ops/src/lib.rs
@@ -45,13 +45,13 @@ use cumulus_primitives_core::ParaId;
 use frame_support::{
 	pallet_prelude::*,
 	traits::{
-		fungible::{Inspect, InspectFreeze, Mutate, MutateFreeze, MutateHold, Unbalanced},
-		tokens::{Fortitude, IdAmount, Precision, Preservation},
-		Defensive, LockableCurrency, ReservableCurrency, WithdrawReasons as LockWithdrawReasons,
+		fungible::{InspectFreeze, Mutate, MutateFreeze, MutateHold, Unbalanced},
+		tokens::Preservation,
+		Defensive, LockableCurrency, ReservableCurrency,
 	},
 };
 use frame_system::pallet_prelude::*;
-use pallet_balances::{AccountData, BalanceLock, Reasons as LockReasons};
+use pallet_balances::AccountData;
 use sp_application_crypto::ByteArray;
 use sp_core::blake2_256;
 use sp_runtime::{
diff --git a/pallets/ah-ops/src/mock.rs b/pallets/ah-ops/src/mock.rs
index 57fdd5cf66..5e514687ea 100644
--- a/pallets/ah-ops/src/mock.rs
+++ b/pallets/ah-ops/src/mock.rs
@@ -81,6 +81,7 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
+#[cfg(feature = "runtime-benchmarks")]
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
 	sp_io::TestExternalities::new(t)
diff --git a/pallets/ah-ops/src/tests.rs b/pallets/ah-ops/src/tests.rs
index 2d83f17d54..25f134c372 100644
--- a/pallets/ah-ops/src/tests.rs
+++ b/pallets/ah-ops/src/tests.rs
@@ -14,10 +14,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::{
-	hypothetically,
-	traits::{fungible::Mutate, InspectLockableCurrency, LockableCurrency, WithdrawReasons},
-};
 use sp_runtime::AccountId32;
 use std::str::FromStr;
 
diff --git a/pallets/rc-migrator/src/accounts.rs b/pallets/rc-migrator/src/accounts.rs
index 69029b0067..7b339baa6e 100644
--- a/pallets/rc-migrator/src/accounts.rs
+++ b/pallets/rc-migrator/src/accounts.rs
@@ -17,14 +17,12 @@
 //! Account/Balance data migrator module.
 
 use crate::{types::*, *};
-use codec::DecodeAll;
 use frame_support::{
 	traits::tokens::{Balance as BalanceT, IdAmount},
 	weights::WeightMeter,
 };
 use frame_system::Account as SystemAccount;
 use pallet_balances::{AccountData, BalanceLock};
-use sp_core::ByteArray;
 use sp_runtime::{traits::Zero, BoundedVec};
 
 /// Account type meant to transfer data between RC and AH.
@@ -217,7 +215,7 @@ pub type AccountFor<T> = Account<
 	TypeInfo,
 	MaxEncodedLen,
 )]
-pub struct MigratedBalances<Balance: Default> {
+pub struct MigratedBalances<Balance> {
 	pub kept: Balance,
 	pub migrated: Balance,
 }
@@ -956,10 +954,7 @@ pub mod tests {
 				// Preimage pallet indexes on Polkadot RC => AH
 				[10, 0] => [5, 0].to_vec(),
 				// Pallet staking indexes on Polkadot RC => AH
-				// TODO: change to the correct encoding when Staking holds are correctly re-created
-				// on Asset Hub in pallet-staking-async, so when we add pallet-staking-async to
-				// Asset Hub.
-				[7, 0] => [5, 0].to_vec(),
+				[7, 0] => [89, 0].to_vec(),
 				// Pallet delegated-staking indexes on Polkadot RC => AH
 				[41, 0] => [83, 0].to_vec(),
 				_ => panic!("Unknown hold id: {:?}", hold_id),
diff --git a/pallets/rc-migrator/src/child_bounties.rs b/pallets/rc-migrator/src/child_bounties.rs
index 7f1bc1ed30..3fa8aa0848 100644
--- a/pallets/rc-migrator/src/child_bounties.rs
+++ b/pallets/rc-migrator/src/child_bounties.rs
@@ -15,11 +15,9 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{types::DefensiveTruncateInto, *};
-use pallet_bounties::{Bounty, BountyIndex};
+use pallet_bounties::BountyIndex;
 use pallet_child_bounties::{ChildBounty, ChildBountyStatus};
 use sp_runtime::traits::BlockNumberProvider;
-#[cfg(feature = "std")]
-use std::collections::BTreeMap;
 
 pub type BalanceOf<T, I = ()> = pallet_treasury::BalanceOf<T, I>;
 
diff --git a/pallets/rc-migrator/src/claims.rs b/pallets/rc-migrator/src/claims.rs
index 89dbf7a91b..739e937b45 100644
--- a/pallets/rc-migrator/src/claims.rs
+++ b/pallets/rc-migrator/src/claims.rs
@@ -118,7 +118,7 @@ impl<T: Config> PalletMigration for ClaimsMigrator<T> {
 					ClaimsStage::Claims(None)
 				},
 				ClaimsStage::Claims(address) => {
-					let mut iter = match address.clone() {
+					let mut iter = match address {
 						Some(address) => alias::Claims::<T>::iter_from(
 							alias::Claims::<T>::hashed_key_for(address),
 						),
@@ -127,7 +127,7 @@ impl<T: Config> PalletMigration for ClaimsMigrator<T> {
 
 					match iter.next() {
 						Some((address, amount)) => {
-							alias::Claims::<T>::remove(&address);
+							alias::Claims::<T>::remove(address);
 							messages.push(RcClaimsMessage::Claims((address, amount)));
 							ClaimsStage::Claims(Some(address))
 						},
@@ -135,7 +135,7 @@ impl<T: Config> PalletMigration for ClaimsMigrator<T> {
 					}
 				},
 				ClaimsStage::Vesting(address) => {
-					let mut iter = match address.clone() {
+					let mut iter = match address {
 						Some(address) => alias::Vesting::<T>::iter_from(
 							alias::Vesting::<T>::hashed_key_for(address),
 						),
@@ -152,7 +152,7 @@ impl<T: Config> PalletMigration for ClaimsMigrator<T> {
 					}
 				},
 				ClaimsStage::Signing(address) => {
-					let mut iter = match address.clone() {
+					let mut iter = match address {
 						Some(address) => alias::Signing::<T>::iter_from(
 							alias::Signing::<T>::hashed_key_for(address),
 						),
@@ -169,7 +169,7 @@ impl<T: Config> PalletMigration for ClaimsMigrator<T> {
 					}
 				},
 				ClaimsStage::Preclaims(address) => {
-					let mut iter = match address.clone() {
+					let mut iter = match address {
 						Some(address) => alias::Preclaims::<T>::iter_from(
 							alias::Preclaims::<T>::hashed_key_for(address),
 						),
diff --git a/pallets/rc-migrator/src/crowdloan.rs b/pallets/rc-migrator/src/crowdloan.rs
index 775734174c..94ff912080 100644
--- a/pallets/rc-migrator/src/crowdloan.rs
+++ b/pallets/rc-migrator/src/crowdloan.rs
@@ -155,19 +155,18 @@ impl<T: Config> PalletMigration for CrowdloanMigrator<T>
 					inner_key = CrowdloanStage::LeaseReserve { last_key: None };
 
 					// Only thing to do here is to re-map the bifrost crowdloan: https://polkadot.subsquare.io/referenda/524
-					if !cfg!(feature = "ahm-kusama") {
-						let leases = pallet_slots::Leases::<T>::take(ParaId::from(2030));
-						if leases.is_empty() {
-							defensive!("Bifrost fund maybe already ended, remove this");
-							continue;
-						}
-
-						// It would be better if we can re-map all contributions to the new para id, but
-						// that requires to iterate them all, so we go the other way around; changing
-						// the leases to the old Bifrost Crowdloan.
-						pallet_slots::Leases::<T>::insert(ParaId::from(3356), leases);
-						log::info!(target: LOG_TARGET, "Migrated Bifrost Leases from crowdloan 2030 to 3356");
+					let leases = pallet_slots::Leases::<T>::take(ParaId::from(2030));
+					if leases.is_empty() {
+						defensive!("Bifrost fund maybe already ended, remove this");
+						continue;
 					}
+
+					// It would be better if we can re-map all contributions to the new para id, but
+					// that requires to iterate them all, so we go the other way around; changing
+					// the leases to the old Bifrost Crowdloan.
+					pallet_slots::Leases::<T>::insert(ParaId::from(3356), leases);
+					log::info!(target: LOG_TARGET, "Migrated Bifrost Leases from crowdloan 2030 to 3356");
+
 					inner_key
 				},
 				CrowdloanStage::LeaseReserve { last_key } => {
@@ -392,7 +391,7 @@ impl<T: Config> crate::types::RcMigrationCheck for CrowdloanMigrator<T>
 		let mut processed_leases: BTreeMap<ParaId, _> = BTreeMap::new();
 		for (para_id, leases) in pallet_slots::Leases::<T>::iter() {
 			// Stay consistent with migrate_many: remap for leases
-			let remapped_para_id = if !cfg!(feature = "ahm-kusama") && para_id == ParaId::from(2030) {
+			let remapped_para_id = if para_id == ParaId::from(2030) {
 				// re-map the bifrost crowdloan: https://polkadot.subsquare.io/referenda/524
 				ParaId::from(3356)
 			} else {
@@ -439,7 +438,7 @@ impl<T: Config> crate::types::RcMigrationCheck for CrowdloanMigrator<T>
 
 		// Process crowdloan funds and contributions
 		for (original_para_id, fund) in pallet_crowdloan::Funds::<T>::iter() {
-			let para_id = if !cfg!(feature = "ahm-kusama") && original_para_id == ParaId::from(2030) {
+			let para_id = if original_para_id == ParaId::from(2030) {
 				// re-map the bifrost crowdloan: https://polkadot.subsquare.io/referenda/524
 				ParaId::from(3356)
 			} else {
@@ -490,7 +489,7 @@ impl<T: Config> crate::types::RcMigrationCheck for CrowdloanMigrator<T>
 		let mut processed_leases: BTreeMap<ParaId, _> = BTreeMap::new();
 		for (para_id, leases) in pallet_slots::Leases::<T>::iter() {
 			// Remap Bifrost para_id consistently with pre_check
-			let remapped_para_id = if !cfg!(feature = "ahm-kusama") && para_id == ParaId::from(2030) {
+			let remapped_para_id = if para_id == ParaId::from(2030) {
 				// re-map the bifrost crowdloan: https://polkadot.subsquare.io/referenda/524
 				ParaId::from(3356)
 			} else {
diff --git a/pallets/rc-migrator/src/lib.rs b/pallets/rc-migrator/src/lib.rs
index d0fc9e51c9..cd011146d1 100644
--- a/pallets/rc-migrator/src/lib.rs
+++ b/pallets/rc-migrator/src/lib.rs
@@ -461,7 +461,7 @@ pub mod pallet {
 		+ pallet_bounties::Config
 		+ pallet_child_bounties::Config
 		+ pallet_treasury::Config<Currency = pallet_balances::Pallet<Self>>
-		+ pallet_delegated_staking::Config
+		+ pallet_delegated_staking::Config<Currency = pallet_balances::Pallet<Self>>
 		+ pallet_xcm::Config
 		+ pallet_staking_async_ah_client::Config
 	{
@@ -1008,9 +1008,9 @@ pub mod pallet {
 				},
 				MigrationStage::Scheduled { start, cool_off_end } =>
 					if now >= start {
-
 						weight_counter.consume(T::DbWeight::get().reads(2));
-						#[cfg(feature = "ahm-staking-migration")]
+
+						#[cfg(not(feature = "std"))] // Skip in tests since snapshot can be off
 						{
 							let current_era = pallet_staking::CurrentEra::<T>::get().defensive_unwrap_or(0);
 							let active_era = pallet_staking::ActiveEra::<T>::get().map(|a| a.index).defensive_unwrap_or(0);
diff --git a/pallets/rc-migrator/src/multisig.rs b/pallets/rc-migrator/src/multisig.rs
index 8b91fbd710..528c8e4e96 100644
--- a/pallets/rc-migrator/src/multisig.rs
+++ b/pallets/rc-migrator/src/multisig.rs
@@ -67,13 +67,6 @@ mod aliases {
 			<T as pallet_multisig::Config>::MaxSignatories,
 		>,
 	>;
-
-	pub type MultisigOf<T> = Multisig<
-		BlockNumberFor<T>,
-		BalanceOf<T>,
-		AccountIdOf<T>,
-		<T as pallet_multisig::Config>::MaxSignatories,
-	>;
 }
 
 /// A multi sig that was migrated out and is ready to be received by AH.
@@ -150,7 +143,7 @@ impl<T: Config> PalletMigration for MultisigMigrator<T> {
 				break;
 			};
 
-			log::debug!(target: LOG_TARGET, "Migrating multisigs of acc {:?}", k1);
+			log::debug!(target: LOG_TARGET, "Migrating multisigs of acc {k1:?}");
 
 			batch.push(RcMultisig {
 				creator: multisig.depositor,
diff --git a/pallets/rc-migrator/src/staking/checks.rs b/pallets/rc-migrator/src/staking/checks.rs
index f03eb23b18..4361abaaac 100644
--- a/pallets/rc-migrator/src/staking/checks.rs
+++ b/pallets/rc-migrator/src/staking/checks.rs
@@ -17,18 +17,13 @@
 //! Checks that the staking migration succeeded.
 
 use crate::{
-	staking::{
-		message::{
-			PortableEraRewardPoints, PortableExposurePage, PortableForcing, PortableNominations,
-			PortablePagedExposureMetadata, PortableStakingLedger, PortableUnappliedSlash,
-			PortableValidatorPrefs, StakingValues,
-		},
-		PortableStakingMessage,
+	staking::message::{
+		PortableEraRewardPoints, PortableExposurePage, PortableNominations,
+		PortablePagedExposureMetadata, PortableStakingLedger, PortableUnappliedSlash,
+		PortableValidatorPrefs,
 	},
 	types::IntoPortable,
-	BalanceOf,
 };
-use pallet_staking::Pallet as Staking;
 use sp_runtime::{AccountId32, Perbill, Percent};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -130,7 +125,7 @@ impl<T: crate::Config> crate::types::RcMigrationCheck for StakingMigratedCorrect
 		}
 	}
 
-	fn post_check(rc_pre_payload: Self::RcPrePayload) {
+	fn post_check(_rc_pre_payload: Self::RcPrePayload) {
 		use pallet_staking::*;
 		// All storage values are gone
 		assert!(!ValidatorCount::<T>::exists());
diff --git a/pallets/rc-migrator/src/staking/delegated_staking.rs b/pallets/rc-migrator/src/staking/delegated_staking.rs
index 94bcea3987..dfe00137f7 100644
--- a/pallets/rc-migrator/src/staking/delegated_staking.rs
+++ b/pallets/rc-migrator/src/staking/delegated_staking.rs
@@ -31,7 +31,6 @@ use types::{AccountIdOf, RcMigrationCheck};
 	PartialEq,
 	Eq,
 )]
-#[cfg_attr(feature = "stable2503", derive(DecodeWithMemTracking))]
 pub enum DelegatedStakingStage<AccountId> {
 	Delegators(Option<AccountId>),
 	Agents(Option<AccountId>),
@@ -40,80 +39,22 @@ pub enum DelegatedStakingStage<AccountId> {
 
 /// Message that is being sent to the AH Migrator.
 #[derive(Encode, Decode, DecodeWithMemTracking, Debug, Clone, TypeInfo, PartialEq, Eq)]
-#[cfg_attr(feature = "stable2503", derive(DecodeWithMemTracking))]
-pub enum RcDelegatedStakingMessage<AccountId, Balance> {
+pub enum PortableDelegatedStakingMessage {
 	Delegators {
-		delegator: AccountId,
-		agent: AccountId,
-		amount: Balance,
+		delegator: AccountId32,
+		agent: AccountId32,
+		amount: u128,
 	},
 	Agents {
-		agent: AccountId,
-		payee: AccountId,
-		total_delegated: Balance,
-		unclaimed_withdrawals: Balance,
-		pending_slash: Balance,
+		agent: AccountId32,
+		payee: AccountId32,
+		total_delegated: u128,
+		unclaimed_withdrawals: u128,
+		pending_slash: u128,
 	},
 }
 
-pub type RcDelegatedStakingMessageOf<T> = RcDelegatedStakingMessage<AccountIdOf<T>, BalanceOf<T>>;
-
-pub mod alias {
-	use super::*;
-
-	// From https://github.com/paritytech/polkadot-sdk/blob/0447d26148ef5b97f40fc01bce2d5156ab335eca/substrate/frame/delegated-staking/src/types.rs#L35
-	#[derive(Default, Encode, Clone, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
-	#[cfg_attr(feature = "stable2503", derive(DecodeWithMemTracking))]
-	pub struct Delegation<AccountId, Balance> {
-		/// The target of delegation.
-		pub agent: AccountId,
-		/// The amount delegated.
-		pub amount: Balance,
-	}
-
-	// From https://github.com/paritytech/polkadot-sdk/blob/0447d26148ef5b97f40fc01bce2d5156ab335eca/substrate/frame/delegated-staking/src/types.rs#L95
-	#[derive(Default, Clone, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
-	#[cfg_attr(feature = "stable2503", derive(DecodeWithMemTracking))]
-	pub struct AgentLedger<AccountId, Balance> {
-		/// Where the reward should be paid out.
-		pub payee: AccountId,
-		/// Sum of all delegated funds to this `Agent`.
-		pub total_delegated: Balance,
-		/// Funds that are withdrawn from core staking but not released to delegator/s. It is a
-		/// subset of `total_delegated` and can never be greater than it.
-		pub unclaimed_withdrawals: Balance,
-		/// Slashes that are not yet applied. This affects the effective balance of the `Agent`.
-		pub pending_slash: Balance,
-	}
-
-	/// Alias for private item [`pallet_delegated_staking::Delegations`].
-	///
-	/// Source: https://github.com/paritytech/polkadot-sdk/blob/0447d26148ef5b97f40fc01bce2d5156ab335eca/substrate/frame/delegated-staking/src/lib.rs#L277
-	#[frame_support::storage_alias(pallet_name)]
-	pub type Delegations<T: pallet_delegated_staking::Config> = CountedStorageMap<
-		pallet_delegated_staking::Pallet<T>,
-		Twox64Concat,
-		<T as frame_system::Config>::AccountId,
-		Delegation<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
-		OptionQuery,
-	>;
-
-	/// Alias for private item [`pallet_delegated_staking::Agents`].
-	///
-	/// Source: https://github.com/paritytech/polkadot-sdk/blob/0447d26148ef5b97f40fc01bce2d5156ab335eca/substrate/frame/delegated-staking/src/lib.rs#L282
-	#[frame_support::storage_alias(pallet_name)]
-	pub type AgentLedgers<T: pallet_delegated_staking::Config> = CountedStorageMap<
-		pallet_delegated_staking::Pallet<T>,
-		Twox64Concat,
-		<T as frame_system::Config>::AccountId,
-		AgentLedger<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
-		OptionQuery,
-	>;
-}
-
-pub struct DelegatedStakingMigrator<T> {
-	_phantom: sp_std::marker::PhantomData<T>,
-}
+pub struct DelegatedStakingMigrator<T>(core::marker::PhantomData<T>);
 
 impl<T: Config> PalletMigration for DelegatedStakingMigrator<T> {
 	type Key = DelegatedStakingStage<AccountIdOf<T>>;
@@ -124,9 +65,8 @@ impl<T: Config> PalletMigration for DelegatedStakingMigrator<T> {
 		weight_counter: &mut WeightMeter,
 	) -> Result<Option<Self::Key>, Self::Error> {
 		let mut last_key = last_key.unwrap_or(DelegatedStakingStage::Delegators(None));
-		let mut messages = XcmBatchAndMeter::<
-			RcDelegatedStakingMessage<AccountIdOf<T>, BalanceOf<T>>,
-		>::new_from_config::<T>();
+		let mut messages =
+			XcmBatchAndMeter::<PortableDelegatedStakingMessage>::new_from_config::<T>();
 
 		loop {
 			if weight_counter.try_consume(T::DbWeight::get().reads_writes(1, 1)).is_err() ||
@@ -157,16 +97,16 @@ impl<T: Config> PalletMigration for DelegatedStakingMigrator<T> {
 			last_key = match last_key {
 				DelegatedStakingStage::Delegators(last_key) => {
 					let mut delegators_iter = if let Some(last_key) = last_key.clone() {
-						alias::Delegations::<T>::iter_from(alias::Delegations::<T>::hashed_key_for(
-							last_key,
-						))
+						pallet_delegated_staking::Delegators::<T>::iter_from(
+							pallet_delegated_staking::Delegators::<T>::hashed_key_for(last_key),
+						)
 					} else {
-						alias::Delegations::<T>::iter()
+						pallet_delegated_staking::Delegators::<T>::iter()
 					};
 					match delegators_iter.next() {
 						Some((key, value)) => {
-							alias::Delegations::<T>::remove(&key);
-							messages.push(RcDelegatedStakingMessage::Delegators {
+							pallet_delegated_staking::Delegators::<T>::remove(&key);
+							messages.push(PortableDelegatedStakingMessage::Delegators {
 								delegator: key.clone(),
 								agent: value.agent,
 								amount: value.amount,
@@ -178,16 +118,16 @@ impl<T: Config> PalletMigration for DelegatedStakingMigrator<T> {
 				},
 				DelegatedStakingStage::Agents(last_key) => {
 					let mut agents_iter = if let Some(last_key) = last_key.clone() {
-						alias::AgentLedgers::<T>::iter_from(
-							alias::AgentLedgers::<T>::hashed_key_for(last_key),
+						pallet_delegated_staking::Agents::<T>::iter_from(
+							pallet_delegated_staking::Agents::<T>::hashed_key_for(last_key),
 						)
 					} else {
-						alias::AgentLedgers::<T>::iter()
+						pallet_delegated_staking::Agents::<T>::iter()
 					};
 					match agents_iter.next() {
 						Some((key, value)) => {
-							alias::AgentLedgers::<T>::remove(&key);
-							messages.push(RcDelegatedStakingMessage::Agents {
+							pallet_delegated_staking::Agents::<T>::remove(&key);
+							messages.push(PortableDelegatedStakingMessage::Agents {
 								agent: key.clone(),
 								payee: value.payee,
 								total_delegated: value.total_delegated,
@@ -222,7 +162,7 @@ impl<T: Config> PalletMigration for DelegatedStakingMigrator<T> {
 pub mod test {
 	use super::*;
 
-	// Delegation used in Delegations storage item
+	// Delegation used in delegators storage item
 	#[derive(Debug, PartialEq, Eq, Clone)]
 	pub struct RcDelegation {
 		pub delegator: AccountId32,
@@ -230,7 +170,7 @@ pub mod test {
 		pub amount: u128,
 	}
 
-	// AgentLedger used in AgentLedgers storage item
+	// AgentLedger used in Agents storage item
 	#[derive(Debug, PartialEq, Eq, Clone)]
 	pub struct RcAgentLedger {
 		pub agent: AccountId32,
@@ -246,18 +186,18 @@ impl<T: Config> RcMigrationCheck for DelegatedStakingMigrator<T> {
 	type RcPrePayload = (Vec<test::RcDelegation>, Vec<test::RcAgentLedger>);
 
 	fn pre_check() -> Self::RcPrePayload {
-		let mut delegations = Vec::new();
+		let mut delegators = Vec::new();
 		let mut agent_ledgers = Vec::new();
 
-		for (delegator, delegation) in alias::Delegations::<T>::iter() {
-			delegations.push(test::RcDelegation {
+		for (delegator, delegation) in pallet_delegated_staking::Delegators::<T>::iter() {
+			delegators.push(test::RcDelegation {
 				delegator: delegator.clone(),
 				agent: delegation.agent.clone(),
 				amount: delegation.amount,
 			});
 		}
 
-		for (agent, agent_ledger) in alias::AgentLedgers::<T>::iter() {
+		for (agent, agent_ledger) in pallet_delegated_staking::Agents::<T>::iter() {
 			agent_ledgers.push(test::RcAgentLedger {
 				agent: agent.clone(),
 				payee: agent_ledger.payee.clone(),
@@ -267,19 +207,19 @@ impl<T: Config> RcMigrationCheck for DelegatedStakingMigrator<T> {
 			});
 		}
 
-		(delegations, agent_ledgers)
+		(delegators, agent_ledgers)
 	}
 
 	fn post_check(_: Self::RcPrePayload) {
-		// Assert storage "Delegations::rc_post::empty"
+		// Assert storage "Delegators::rc_post::empty"
 		assert!(
-			alias::Delegations::<T>::iter().next().is_none(),
-			"No delegations should exist on the Relay Chain after migration"
+			pallet_delegated_staking::Delegators::<T>::iter().next().is_none(),
+			"No delegators should exist on the Relay Chain after migration"
 		);
 
-		// Assert storage "AgentLedgers::rc_post::empty"
+		// Assert storage "Agents::rc_post::empty"
 		assert!(
-			alias::AgentLedgers::<T>::iter().next().is_none(),
+			pallet_delegated_staking::Agents::<T>::iter().next().is_none(),
 			"No agent ledgers should exist on the Relay Chain after migration"
 		);
 	}
diff --git a/pallets/rc-migrator/src/staking/message.rs b/pallets/rc-migrator/src/staking/message.rs
index 38e67f5fd3..556f55bab3 100644
--- a/pallets/rc-migrator/src/staking/message.rs
+++ b/pallets/rc-migrator/src/staking/message.rs
@@ -19,18 +19,12 @@
 extern crate alloc;
 
 use crate::{
-	staking::{AccountIdOf, BalanceOf, StakingMigrator},
+	staking::{BalanceOf, StakingMigrator},
 	types::DefensiveTruncateInto,
 	*,
 };
 use alloc::collections::BTreeMap;
-use codec::{EncodeLike, HasCompact};
-use core::fmt::Debug;
-pub use frame_election_provider_support::PageIndex;
-use pallet_staking::{
-	slashing::{SlashingSpans, SpanIndex, SpanRecord},
-	EraRewardPoints, Nominations, RewardDestination, StakingLedger,
-};
+use pallet_staking::RewardDestination;
 use sp_runtime::{Perbill, Percent};
 use sp_staking::{EraIndex, Page, SessionIndex};
 
@@ -468,6 +462,7 @@ impl IntoPortable for pallet_staking::RewardDestination<AccountId32> {
 
 // RewardDestination: Portable -> AH
 impl Into<pallet_staking_async::RewardDestination<AccountId32>> for PortableRewardDestination {
+	#[allow(deprecated)]
 	fn into(self) -> pallet_staking_async::RewardDestination<AccountId32> {
 		use pallet_staking_async::RewardDestination::*;
 		match self {
diff --git a/pallets/rc-migrator/src/staking/nom_pools.rs b/pallets/rc-migrator/src/staking/nom_pools.rs
index c6f8a2772e..f4e8ec4baf 100644
--- a/pallets/rc-migrator/src/staking/nom_pools.rs
+++ b/pallets/rc-migrator/src/staking/nom_pools.rs
@@ -21,7 +21,7 @@ use crate::{types::*, *};
 use alias::{RewardPool, SubPools};
 use frame_support::traits::{ConstU32, Get};
 use pallet_nomination_pools::{BondedPoolInner, ClaimPermission, PoolId, PoolMember};
-use sp_runtime::{Perbill, Saturating};
+use sp_runtime::Perbill;
 
 /// The stages of the nomination pools pallet migration.
 ///
@@ -504,7 +504,7 @@ impl<T: Config> crate::types::RcMigrationCheck for NomPoolsMigrator<T> {
 		}
 
 		// Collect bonded pools
-		for (pool_id, mut pool) in pallet_nomination_pools::BondedPools::<T>::iter() {
+		for (pool_id, pool) in pallet_nomination_pools::BondedPools::<T>::iter() {
 			let generic_pool = tests::GenericBondedPoolInner {
 				commission: tests::GenericCommission {
 					current: pool.commission.current,
diff --git a/pallets/rc-migrator/src/staking/staking.rs b/pallets/rc-migrator/src/staking/staking.rs
index c8c0c3ec0c..64507b408f 100644
--- a/pallets/rc-migrator/src/staking/staking.rs
+++ b/pallets/rc-migrator/src/staking/staking.rs
@@ -17,17 +17,11 @@
 //! Pallet staking migration.
 
 pub use crate::staking::message::PortableStakingMessage;
-use crate::{types::DefensiveTruncateInto, *};
-use codec::{EncodeLike, FullCodec, FullEncode, HasCompact};
-use core::fmt::Debug;
+use crate::*;
+use codec::{FullCodec, FullEncode};
 pub use frame_election_provider_support::PageIndex;
-use pallet_staking::{
-	slashing::{SlashingSpans, SpanIndex, SpanRecord},
-	ActiveEraInfo, EraRewardPoints, Forcing, Nominations, RewardDestination, StakingLedger,
-	ValidatorPrefs,
-};
-use sp_runtime::{Perbill, Percent};
-use sp_staking::{EraIndex, ExposurePage, Page, PagedExposureMetadata, SessionIndex};
+use pallet_staking::slashing::SpanIndex;
+use sp_staking::{EraIndex, Page};
 
 pub struct StakingMigrator<T> {
 	_phantom: PhantomData<T>,
@@ -436,7 +430,7 @@ impl<T: Config> PalletMigration for StakingMigrator<T> {
 					};
 
 					match iter.next() {
-						Some((era, validator, slash)) => {
+						Some((era, validator, _slash)) => {
 							pallet_staking::NominatorSlashInEra::<T>::remove(&era, &validator);
 							// Not migrated.
 							StakingStage::NominatorSlashInEra(Some((era, validator)))
@@ -448,7 +442,7 @@ impl<T: Config> PalletMigration for StakingMigrator<T> {
 					let mut iter = resume::<pallet_staking::SlashingSpans<T>, _, _>(account);
 
 					match iter.next() {
-						Some((account, spans)) => {
+						Some((account, _spans)) => {
 							pallet_staking::SlashingSpans::<T>::remove(&account);
 							// Not migrated.
 							StakingStage::SlashingSpans(Some(account))
@@ -460,7 +454,7 @@ impl<T: Config> PalletMigration for StakingMigrator<T> {
 					let mut iter = resume::<pallet_staking::SpanSlash<T>, _, _>(next);
 
 					match iter.next() {
-						Some(((account, span), slash)) => {
+						Some(((account, span), _slash)) => {
 							pallet_staking::SpanSlash::<T>::remove((&account, &span));
 							// Not migrated.
 							StakingStage::SpanSlash(Some((account, span)))
diff --git a/pallets/rc-migrator/src/types.rs b/pallets/rc-migrator/src/types.rs
index f4b097dc43..99a7738737 100644
--- a/pallets/rc-migrator/src/types.rs
+++ b/pallets/rc-migrator/src/types.rs
@@ -149,7 +149,7 @@ pub enum AhMigratorCall<T: Config> {
 	},
 	#[codec(index = 23)]
 	ReceiveDelegatedStakingMessages {
-		messages: Vec<staking::delegated_staking::RcDelegatedStakingMessageOf<T>>,
+		messages: Vec<staking::delegated_staking::PortableDelegatedStakingMessage>,
 	},
 	#[codec(index = 24)]
 	ReceiveChildBountiesMessages { messages: Vec<child_bounties::PortableChildBountiesMessage> },
@@ -178,7 +178,7 @@ pub enum AhMigratorCall<T: Config> {
 	PartialEq,
 	Eq,
 )]
-pub struct MigrationFinishedData<Balance: Default> {
+pub struct MigrationFinishedData<Balance> {
 	/// Total native token balance NOT migrated from Relay Chain
 	pub rc_balance_kept: Balance,
 }
@@ -342,7 +342,7 @@ impl<Querier: Contains<Location>> Contains<Xcm<()>> for ExceptResponseFor<Querie
 	TypeInfo,
 	MaxEncodedLen,
 )]
-pub enum QueuePriority<BlockNumber: Copy> {
+pub enum QueuePriority<BlockNumber> {
 	/// Use the default priority pattern from the pallet configuration.
 	#[default]
 	Config,
diff --git a/pallets/rc-migrator/src/xcm_config.rs b/pallets/rc-migrator/src/xcm_config.rs
index 554bf98aec..266616ed4a 100644
--- a/pallets/rc-migrator/src/xcm_config.rs
+++ b/pallets/rc-migrator/src/xcm_config.rs
@@ -24,7 +24,6 @@ use frame_support::{
 use xcm::latest::prelude::*;
 use xcm_builder::Case;
 
-#[cfg(not(feature = "ahm-kusama"))]
 use polkadot_runtime_constants::system_parachain::*;
 
 parameter_types! {
diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs
index ac3f263e03..09cc076db2 100644
--- a/relay/polkadot/src/lib.rs
+++ b/relay/polkadot/src/lib.rs
@@ -2009,9 +2009,7 @@ mod benches {
 	pub use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench;
 	pub use pallet_offences_benchmarking::Pallet as OffencesBench;
 	pub use pallet_session_benchmarking::Pallet as SessionBench;
-	pub use pallet_xcm::benchmarking::{
-		Pallet as PalletXcmExtrinsiscsBenchmark, Pallet as PalletXcmExtrinsicsBenchmark,
-	};
+	pub use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 	use polkadot_runtime_constants::system_parachain::AssetHubParaId;
 	use xcm_builder::MintLocation;
 	use xcm_config::{
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/ah_migration/mod.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/ah_migration/mod.rs
index 29dc44a17e..6eed63e53b 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/ah_migration/mod.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/ah_migration/mod.rs
@@ -21,13 +21,11 @@ use super::*;
 use alloc::boxed::Box;
 use codec::DecodeAll;
 use frame_support::pallet_prelude::{PalletInfoAccess, TypeInfo};
-use frame_system::pallet_prelude::BlockNumberFor;
 use pallet_ah_migrator::LOG_TARGET;
 use polkadot_runtime_common::impls::{LocatableAssetConverter, VersionedLocatableAsset};
 use sp_core::Get;
 use sp_runtime::traits::{Convert, TryConvert};
 use system_parachains_common::pay::VersionedLocatableAccount;
-use xcm::latest::prelude::*;
 
 impl From<pallet_rc_migrator::types::PortableHoldReason> for RuntimeHoldReason {
 	fn from(reason: pallet_rc_migrator::types::PortableHoldReason) -> Self {
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs
index 2f3f0b3fca..e441c4c8d7 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs
@@ -87,7 +87,7 @@ use polkadot_runtime_constants::time::{DAYS as RC_DAYS, HOURS as RC_HOURS, MINUT
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, ConstU128, OpaqueMetadata};
 use sp_runtime::{
-	create_runtime_str, generic, impl_opaque_keys,
+	generic, impl_opaque_keys,
 	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, IdentityLookup, Verify},
 	transaction_validity::{TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, Perbill, Permill,
@@ -113,8 +113,8 @@ use frame_support::{
 		fungibles,
 		tokens::imbalance::ResolveAssetTo,
 		AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, ConstU8, Contains, EitherOf,
-		EitherOfDiverse, Equals, EverythingBut, InstanceFilter, LinearStoragePrice,
-		NeverEnsureOrigin, PrivilegeCmp, TheseExcept, TransformOrigin, WithdrawReasons,
+		EitherOfDiverse, Equals, InstanceFilter, LinearStoragePrice, NeverEnsureOrigin,
+		PrivilegeCmp, TheseExcept, TransformOrigin, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, Weight, WeightToFee as _},
 	PalletId,
@@ -134,7 +134,7 @@ use sp_runtime::RuntimeDebug;
 pub use system_parachains_constants::async_backing::SLOT_DURATION;
 use system_parachains_constants::{
 	async_backing::{
-		AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO,
+		AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO,
 	},
 	polkadot::{
 		consensus::{
@@ -1796,9 +1796,7 @@ mod benches {
 	pub use frame_system_benchmarking::{
 		extensions::Pallet as SystemExtensionsBench, Pallet as SystemBench,
 	};
-	pub use pallet_xcm::benchmarking::{
-		Pallet as PalletXcmExtrinsiscsBenchmark, Pallet as PalletXcmExtrinsicsBenchmark,
-	};
+	pub use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 	pub use pallet_xcm_bridge_hub_router::benchmarking::Pallet as XcmBridgeHubRouterBench;
 	pub use sp_storage::TrackedStorageKey;
 
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/staking/mod.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/staking/mod.rs
index 42f0eda0e4..782924d38b 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/staking/mod.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/staking/mod.rs
@@ -27,7 +27,6 @@ use frame_support::traits::tokens::imbalance::ResolveTo;
 use pallet_election_provider_multi_block::{self as multi_block, SolutionAccuracyOf};
 use pallet_staking_async::UseValidatorsMap;
 use pallet_staking_async_rc_client as rc_client;
-use pallet_treasury::TreasuryAccountId;
 use sp_arithmetic::FixedU128;
 use sp_runtime::{
 	transaction_validity::TransactionPriority, FixedPointNumber, SaturatedConversion,
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/staking/nom_pools.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/staking/nom_pools.rs
index 9f05f04c89..dbccf5ef79 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/staking/nom_pools.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/staking/nom_pools.rs
@@ -18,9 +18,7 @@
 
 use crate::{staking::StakingAdmin, *};
 use frame_support::traits::Nothing;
-use pallet_nomination_pools::{adapter, BondType};
-use sp_runtime::{DispatchError, DispatchResult, FixedU128};
-use sp_staking::{EraIndex, Stake, StakingUnchecked};
+use sp_runtime::FixedU128;
 
 parameter_types! {
 	pub const PoolsPalletId: PalletId = PalletId(*b"py/nopls");
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/treasury.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/treasury.rs
index 7fb5b9e10a..09ebb1d149 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/treasury.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/treasury.rs
@@ -16,7 +16,7 @@
 use crate::*;
 use frame_support::traits::{tokens::UnityOrOuterConversion, FromContains};
 use polkadot_runtime_common::impls::{ContainsParts, VersionedLocatableAsset};
-use system_parachains_common::pay::{LocalPay, VersionedLocatableAccount};
+use system_parachains_common::pay::VersionedLocatableAccount;
 
 parameter_types! {
 	pub const SpendPeriod: BlockNumber = 24 * RC_DAYS;
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block.rs
index 8b3bfa50bd..2a33672edc 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block.rs
@@ -42,6 +42,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
+#![allow(dead_code)]
 
 use frame_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_signed.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_signed.rs
index afb2bad5c0..86e6b07ad4 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_signed.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_signed.rs
@@ -42,6 +42,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
+#![allow(dead_code)]
 
 use frame_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_unsigned.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_unsigned.rs
index ccd0dfdc6c..4ac2594f75 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_unsigned.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_unsigned.rs
@@ -42,6 +42,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
+#![allow(dead_code)]
 
 use frame_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_verifier.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_verifier.rs
index 9f1c24d3c2..221654c0b2 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_verifier.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_election_provider_multi_block_verifier.rs
@@ -42,6 +42,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
+#![allow(dead_code)]
 
 use frame_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs
index 6f417dacf7..c9158917c3 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs
@@ -32,7 +32,7 @@ use frame_support::{
 	parameter_types,
 	traits::{
 		tokens::imbalance::{ResolveAssetTo, ResolveTo},
-		ConstU32, Contains, ContainsPair, Disabled, Equals, Everything, FromContains, Nothing,
+		ConstU32, Contains, ContainsPair, Disabled, Equals, Everything, FromContains,
 		PalletInfoAccess,
 	},
 };
@@ -45,8 +45,7 @@ use parachains_common::xcm_config::{
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_constants::system_parachain;
 use snowbridge_inbound_queue_primitives::EthereumLocationsConverterFor;
-use sp_runtime::traits::{AccountIdConversion, ConvertInto, TryConvertInto};
-use system_parachains_constants::TREASURY_PALLET_ID;
+use sp_runtime::traits::TryConvertInto;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AliasChildLocation, AllowExplicitUnpaidExecutionFrom,
diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/tests/tests.rs b/system-parachains/asset-hubs/asset-hub-polkadot/tests/tests.rs
index ddaa66ccff..dc0a9aa532 100644
--- a/system-parachains/asset-hubs/asset-hub-polkadot/tests/tests.rs
+++ b/system-parachains/asset-hubs/asset-hub-polkadot/tests/tests.rs
@@ -19,10 +19,9 @@
 
 use asset_hub_polkadot_runtime::{
 	xcm_config::{
-		bridging::{self, XcmBridgeHubRouterFeeAssetId},
-		CheckingAccount, DotLocation, ForeignCreatorsSovereignAccountOf, GovernanceLocation,
-		LocationToAccountId, RelayTreasuryLocation, StakingPot, TreasuryAccount,
-		TrustBackedAssetsPalletLocation, XcmConfig,
+		bridging, CheckingAccount, DotLocation, ForeignCreatorsSovereignAccountOf,
+		GovernanceLocation, LocationToAccountId, StakingPot, TrustBackedAssetsPalletLocation,
+		XcmConfig,
 	},
 	AllPalletsWithoutSystem, AssetConversion, AssetDeposit, Assets, Balances, Block,
 	ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, MetadataDepositBase,