diff --git a/Cargo.lock b/Cargo.lock
index b4a400cdff5..ad2d507004d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -443,16 +443,13 @@ dependencies = [
  "fnv",
  "futures",
  "futures-timer",
- "futures-timer",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sc-chain-spec",
- "sc-chain-spec",
  "sc-client-api",
  "sc-consensus",
  "sc-finality-grandpa",
- "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
  "sc-network-common",
@@ -486,7 +483,6 @@ dependencies = [
  "parking_lot 0.12.1",
  "sc-rpc",
  "sc-utils",
- "sc-utils",
  "serde",
  "sp-beefy",
  "sp-core",
@@ -2997,19 +2993,15 @@ dependencies = [
  "gethostname",
  "handlebars",
  "hash-db",
- "hash-db",
  "itertools",
  "kvdb",
- "kvdb",
  "lazy_static",
  "linked-hash-map",
  "log",
  "memory-db",
- "memory-db",
  "parity-scale-codec",
  "rand 0.8.5",
  "rand_pcg 0.3.1",
- "rand_pcg 0.3.1",
  "sc-block-builder",
  "sc-cli",
  "sc-client-api",
@@ -3020,7 +3012,6 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_nanos",
- "serde_nanos",
  "sp-api",
  "sp-blockchain",
  "sp-core",
@@ -3034,7 +3025,6 @@ dependencies = [
  "sp-storage",
  "sp-trie",
  "tempfile",
- "tempfile",
  "thiserror",
  "thousands",
 ]
@@ -3101,19 +3091,16 @@ name = "frame-remote-externalities"
 version = "0.10.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51"
 dependencies = [
- "env_logger 0.9.0",
  "env_logger 0.9.0",
  "futures",
  "log",
  "parity-scale-codec",
  "serde",
  "serde_json",
- "serde_json",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-version",
- "sp-version",
  "substrate-rpc-client",
  "tokio",
 ]
@@ -3436,11 +3423,9 @@ checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
  "cfg-if",
  "js-sys",
- "js-sys",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
  "wasm-bindgen",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -4971,7 +4956,6 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-io",
- "sp-io",
  "sp-mmr-primitives",
  "sp-runtime",
 ]
@@ -5383,10 +5367,8 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 [[package]]
 name = "orchestra"
 version = "0.0.2"
-version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0aab54694ddaa8a9b703724c6ef04272b2d27bc32d2c855aae5cdd1857216b43"
-checksum = "0aab54694ddaa8a9b703724c6ef04272b2d27bc32d2c855aae5cdd1857216b43"
 dependencies = [
  "async-trait",
  "dyn-clonable",
@@ -5402,10 +5384,8 @@ dependencies = [
 [[package]]
 name = "orchestra-proc-macro"
 version = "0.0.2"
-version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a702b2f6bf592b3eb06c00d80d05afaf7a8eff6b41bb361e397d799acc21b45a"
-checksum = "a702b2f6bf592b3eb06c00d80d05afaf7a8eff6b41bb361e397d799acc21b45a"
 dependencies = [
  "expander 0.0.6",
  "itertools",
@@ -5725,7 +5705,6 @@ dependencies = [
  "parity-scale-codec",
  "rand 0.8.5",
  "rand_pcg 0.3.1",
- "rand_pcg 0.3.1",
  "scale-info",
  "serde",
  "smallvec",
@@ -5809,7 +5788,6 @@ dependencies = [
  "pallet-election-provider-support-benchmarking",
  "parity-scale-codec",
  "rand 0.7.3",
- "rand 0.7.3",
  "scale-info",
  "sp-arithmetic",
  "sp-core",
@@ -5818,7 +5796,6 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "static_assertions",
- "static_assertions",
  "strum",
 ]
 
@@ -6247,7 +6224,6 @@ dependencies = [
  "pallet-session",
  "pallet-staking",
  "rand 0.7.3",
- "rand 0.7.3",
  "sp-runtime",
  "sp-session",
  "sp-std",
@@ -6821,25 +6797,19 @@ checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5"
 [[package]]
 name = "pbkdf2"
 version = "0.4.0"
-version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
-checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
 dependencies = [
  "crypto-mac 0.8.0",
- "crypto-mac 0.8.0",
 ]
 
 [[package]]
 name = "pbkdf2"
 version = "0.8.0"
-version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
 dependencies = [
  "crypto-mac 0.11.1",
- "crypto-mac 0.11.1",
 ]
 
 [[package]]
@@ -7499,7 +7469,6 @@ dependencies = [
  "sp-blockchain",
  "sp-inherents",
  "sp-runtime",
- "sp-runtime",
  "thiserror",
  "tracing-gum",
 ]
@@ -8744,7 +8713,6 @@ dependencies = [
  "rand_core 0.5.1",
  "rand_hc",
  "rand_pcg 0.2.1",
- "rand_pcg 0.2.1",
 ]
 
 [[package]]
@@ -8824,15 +8792,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_pcg"
 version = "0.3.1"
@@ -9354,7 +9313,6 @@ dependencies = [
  "prost",
  "prost-build",
  "rand 0.7.3",
- "rand 0.7.3",
  "sc-client-api",
  "sc-network-common",
  "sp-api",
@@ -9411,11 +9369,9 @@ name = "sc-chain-spec"
 version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51"
 dependencies = [
- "impl-trait-for-tuples",
  "impl-trait-for-tuples",
  "memmap2",
  "parity-scale-codec",
- "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-network-common",
  "sc-telemetry",
@@ -9451,7 +9407,6 @@ dependencies = [
  "names",
  "parity-scale-codec",
  "rand 0.7.3",
- "rand 0.7.3",
  "regex",
  "rpassword",
  "sc-client-api",
@@ -9485,7 +9440,6 @@ dependencies = [
  "fnv",
  "futures",
  "hash-db",
- "hash-db",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -9503,7 +9457,6 @@ dependencies = [
  "sp-state-machine",
  "sp-storage",
  "sp-trie",
- "sp-trie",
  "substrate-prometheus-endpoint",
 ]
 
@@ -9609,7 +9562,6 @@ dependencies = [
  "sc-telemetry",
  "schnorrkel",
  "serde",
- "serde",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -9621,11 +9573,9 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
- "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-version",
- "sp-version",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
@@ -9687,7 +9637,6 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "thiserror",
- "thiserror",
 ]
 
 [[package]]
@@ -9779,7 +9728,6 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sc-keystore",
- "sc-keystore",
  "sc-network",
  "sc-network-common",
  "sc-network-gossip",
@@ -9814,7 +9762,6 @@ dependencies = [
  "sc-rpc",
  "serde",
  "serde_json",
- "serde_json",
  "sp-blockchain",
  "sp-core",
  "sp-runtime",
@@ -9833,7 +9780,6 @@ dependencies = [
  "sc-client-api",
  "sc-network-common",
  "sc-transaction-pool-api",
- "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
 ]
@@ -9862,22 +9808,17 @@ dependencies = [
  "async-trait",
  "asynchronous-codec",
  "bitflags",
- "bitflags",
  "bytes",
  "cid",
- "cid",
  "either",
  "fnv",
  "fork-tree",
- "fork-tree",
  "futures",
  "futures-timer",
  "ip_network",
  "libp2p",
  "linked-hash-map",
  "linked_hash_set",
- "linked-hash-map",
- "linked_hash_set",
  "log",
  "lru",
  "parity-scale-codec",
@@ -9885,8 +9826,6 @@ dependencies = [
  "pin-project",
  "prost",
  "rand 0.7.3",
- "prost",
- "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -9925,7 +9864,6 @@ dependencies = [
  "thiserror",
  "unsigned-varint",
  "void",
- "void",
 ]
 
 [[package]]
@@ -10033,7 +9971,6 @@ dependencies = [
  "array-bytes 4.2.0",
  "futures",
  "hex",
- "hex",
  "libp2p",
  "log",
  "parity-scale-codec",
@@ -10063,7 +10000,6 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "rand 0.7.3",
- "rand 0.7.3",
  "sc-client-api",
  "sc-network-common",
  "sc-peerset",
@@ -10105,7 +10041,6 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb
 dependencies = [
  "futures",
  "hash-db",
- "hash-db",
  "jsonrpsee",
  "log",
  "parity-scale-codec",
@@ -10134,14 +10069,11 @@ name = "sc-rpc-api"
 version = "0.10.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51"
 dependencies = [
- "futures",
  "futures",
  "jsonrpsee",
  "log",
- "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "parking_lot 0.12.1",
  "sc-chain-spec",
  "sc-transaction-pool-api",
  "scale-info",
@@ -10151,7 +10083,6 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-tracing",
- "sp-tracing",
  "sp-version",
  "thiserror",
 ]
@@ -10161,7 +10092,6 @@ name = "sc-rpc-server"
 version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51"
 dependencies = [
- "futures",
  "futures",
  "http",
  "jsonrpsee",
@@ -10203,14 +10133,12 @@ dependencies = [
  "futures",
  "futures-timer",
  "hash-db",
- "hash-db",
  "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "pin-project",
  "rand 0.7.3",
- "rand 0.7.3",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
@@ -10240,21 +10168,17 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
- "sp-application-crypto",
- "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
  "sp-externalities",
  "sp-inherents",
- "sp-inherents",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
  "sp-storage",
  "sp-tracing",
- "sp-tracing",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -10277,7 +10201,6 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sc-client-api",
- "sc-client-api",
  "sp-core",
 ]
 
@@ -10310,8 +10233,6 @@ dependencies = [
  "log",
  "rand 0.7.3",
  "rand_pcg 0.2.1",
- "rand 0.7.3",
- "rand_pcg 0.2.1",
  "regex",
  "sc-telemetry",
  "serde",
@@ -10333,7 +10254,6 @@ dependencies = [
  "parking_lot 0.12.1",
  "pin-project",
  "rand 0.7.3",
- "rand 0.7.3",
  "serde",
  "serde_json",
  "thiserror",
@@ -10677,15 +10597,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_nanos"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.8.2"
@@ -10987,7 +10898,6 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-debug-derive",
- "sp-debug-derive",
  "sp-std",
  "static_assertions",
 ]
@@ -11072,7 +10982,6 @@ dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "futures-timer",
  "log",
  "parity-scale-codec",
  "sp-core",
@@ -11135,8 +11044,6 @@ dependencies = [
  "serde",
  "sp-arithmetic",
  "sp-runtime",
- "sp-arithmetic",
- "sp-runtime",
  "sp-std",
  "sp-timestamp",
 ]
@@ -11164,7 +11071,6 @@ dependencies = [
  "bitflags",
  "blake2",
  "byteorder",
- "byteorder",
  "dyn-clonable",
  "ed25519-zebra",
  "futures",
@@ -11176,12 +11082,10 @@ dependencies = [
  "log",
  "merlin",
  "num-traits",
- "num-traits",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "primitive-types",
  "rand 0.7.3",
- "rand 0.7.3",
  "regex",
  "scale-info",
  "schnorrkel",
@@ -11199,7 +11103,6 @@ dependencies = [
  "thiserror",
  "tiny-bip39",
  "wasmi 0.13.0",
- "wasmi 0.13.0",
  "zeroize",
 ]
 
@@ -11299,12 +11202,10 @@ dependencies = [
  "ed25519-dalek",
  "futures",
  "hash-db",
- "hash-db",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "parking_lot 0.12.1",
  "secp256k1",
  "sp-core",
  "sp-externalities",
@@ -11315,7 +11216,6 @@ dependencies = [
  "sp-tracing",
  "sp-trie",
  "sp-wasm-interface",
- "sp-wasm-interface",
  "tracing",
  "tracing-core",
 ]
@@ -11431,7 +11331,6 @@ dependencies = [
  "parity-scale-codec",
  "paste",
  "rand 0.7.3",
- "rand 0.7.3",
  "scale-info",
  "serde",
  "sp-application-crypto",
@@ -11515,11 +11414,9 @@ dependencies = [
  "hash-db",
  "log",
  "num-traits",
- "num-traits",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "rand 0.7.3",
- "rand 0.7.3",
  "smallvec",
  "sp-core",
  "sp-externalities",
@@ -11529,7 +11426,6 @@ dependencies = [
  "thiserror",
  "tracing",
  "trie-root",
- "trie-root",
 ]
 
 [[package]]
@@ -11560,7 +11456,6 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "sp-api",
- "sp-api",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
@@ -11673,7 +11568,6 @@ name = "sp-weights"
 version = "4.0.0"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51"
 dependencies = [
- "impl-trait-for-tuples",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
@@ -11991,11 +11885,9 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "sc-client-api",
- "sc-client-api",
  "sc-rpc-api",
  "sc-transaction-pool-api",
  "serde_json",
- "serde_json",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -12008,7 +11900,6 @@ name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51"
 dependencies = [
- "futures-util",
  "futures-util",
  "hyper",
  "log",
@@ -12044,11 +11935,9 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-io",
- "sp-io",
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
- "sp-std",
  "sp-trie",
  "trie-db",
 ]
@@ -12321,22 +12210,16 @@ dependencies = [
 [[package]]
 name = "tiny-bip39"
 version = "0.8.2"
-version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d"
-checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d"
 dependencies = [
  "anyhow",
  "hmac 0.8.1",
- "hmac 0.8.1",
  "once_cell",
  "pbkdf2 0.4.0",
  "rand 0.7.3",
- "pbkdf2 0.4.0",
- "rand 0.7.3",
  "rustc-hash",
  "sha2 0.9.8",
- "sha2 0.9.8",
  "thiserror",
  "unicode-normalization",
  "wasm-bindgen",
@@ -12695,7 +12578,6 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "sc-chain-spec",
- "sc-chain-spec",
  "sc-cli",
  "sc-executor",
  "sc-service",