diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index dc02e2482caf18a18f6ee95de6a0a0c150bc70b9..6aabb31c39c507d39bd5ceb128ec423e3fcc29c3 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1500,12 +1500,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
-
 [[package]]
 name = "difference"
 version = "2.0.0"
@@ -2095,7 +2089,7 @@ dependencies = [
  "frame-support-test-pallet",
  "frame-system",
  "parity-scale-codec",
- "pretty_assertions 0.6.1",
+ "pretty_assertions",
  "rustversion",
  "serde",
  "sp-core",
@@ -4080,7 +4074,6 @@ dependencies = [
 name = "metered-channel"
 version = "0.9.9"
 dependencies = [
- "assert_matches",
  "derive_more",
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -5734,10 +5727,8 @@ dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "lru",
- "maplit",
  "parity-scale-codec",
  "polkadot-erasure-coding",
- "polkadot-node-core-runtime-api",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -5746,7 +5737,6 @@ dependencies = [
  "polkadot-primitives",
  "rand 0.8.4",
  "sc-network",
- "sp-application-crypto",
  "sp-core",
  "sp-keyring",
  "sp-keystore",
@@ -5882,22 +5872,17 @@ dependencies = [
  "futures-timer 3.0.2",
  "lazy_static",
  "lru",
- "maplit",
  "parity-scale-codec",
  "polkadot-erasure-coding",
- "polkadot-node-core-runtime-api",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.4",
  "sc-keystore",
  "sc-network",
- "smallvec",
  "sp-application-crypto",
- "sp-core",
  "sp-keyring",
  "sp-keystore",
  "sp-tracing",
@@ -5992,7 +5977,6 @@ dependencies = [
  "kvdb",
  "kvdb-memorydb",
  "lru",
- "maplit",
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -6003,13 +5987,10 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
- "rand 0.8.4",
  "rand_core 0.5.1",
- "sc-client-api",
  "sc-keystore",
  "schnorrkel",
  "sp-application-crypto",
- "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-consensus-slots",
@@ -6162,7 +6143,6 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
- "polkadot-overseer",
  "polkadot-primitives",
  "sc-keystore",
  "sp-core",
@@ -6295,15 +6275,10 @@ dependencies = [
 name = "polkadot-node-metrics"
 version = "0.9.9"
 dependencies = [
- "async-trait",
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "jemalloc-ctl",
  "metered-channel",
- "sc-network",
- "sp-application-crypto",
- "sp-core",
- "sp-keystore",
  "substrate-prometheus-endpoint",
 ]
 
@@ -6333,7 +6308,6 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-parachain",
  "polkadot-primitives",
- "polkadot-statement-table",
  "schnorrkel",
  "serde",
  "sp-application-crypto",
@@ -6342,9 +6316,7 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "sp-maybe-compressed-blob",
- "sp-runtime",
  "thiserror",
- "tracing",
  "zstd",
 ]
 
@@ -6363,55 +6335,34 @@ version = "0.9.9"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
- "futures-timer 3.0.2",
- "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.8",
- "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
- "polkadot-statement-table",
  "sc-keystore",
- "sc-network",
- "smallvec",
  "sp-application-crypto",
  "sp-core",
  "sp-keyring",
  "sp-keystore",
- "tracing",
 ]
 
 [[package]]
 name = "polkadot-node-subsystem-types"
 version = "0.9.9"
 dependencies = [
- "assert_matches",
- "async-std",
- "async-trait",
  "derive_more",
  "futures 0.3.16",
- "futures-timer 3.0.2",
- "lazy_static",
- "log",
- "mick-jaeger",
- "parity-scale-codec",
- "parking_lot 0.11.1",
- "pin-project 1.0.8",
  "polkadot-node-jaeger",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
- "polkadot-node-subsystem-test-helpers",
  "polkadot-overseer-gen",
  "polkadot-primitives",
  "polkadot-statement-table",
  "sc-network",
  "smallvec",
- "sp-core",
  "substrate-prometheus-endpoint",
  "thiserror",
- "tracing",
 ]
 
 [[package]]
@@ -6423,28 +6374,23 @@ dependencies = [
  "derive_more",
  "env_logger 0.9.0",
  "futures 0.3.16",
- "futures-timer 3.0.2",
  "itertools 0.10.1",
  "log",
  "lru",
  "metered-channel",
  "parity-scale-codec",
- "parking_lot 0.11.1",
  "pin-project 1.0.8",
  "polkadot-node-jaeger",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
- "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
  "polkadot-overseer",
  "polkadot-primitives",
  "rand 0.8.4",
- "sc-network",
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
- "substrate-prometheus-endpoint",
  "thiserror",
  "tracing",
 ]
@@ -6454,11 +6400,9 @@ name = "polkadot-overseer"
 version = "0.9.9"
 dependencies = [
  "assert_matches",
- "async-trait",
  "femme",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "kv-log-macro",
  "lru",
  "metered-channel",
  "parking_lot 0.11.1",
@@ -6479,7 +6423,6 @@ dependencies = [
 name = "polkadot-overseer-all-subsystems-gen"
 version = "0.9.9"
 dependencies = [
- "assert_matches",
  "proc-macro2",
  "quote",
  "syn",
@@ -6540,7 +6483,6 @@ dependencies = [
  "parity-util-mem",
  "polkadot-core-primitives",
  "polkadot-parachain",
- "pretty_assertions 0.7.2",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -6552,12 +6494,10 @@ dependencies = [
  "sp-io",
  "sp-keystore",
  "sp-runtime",
- "sp-serializer",
  "sp-staking",
  "sp-std",
  "sp-trie",
  "sp-version",
- "thiserror",
 ]
 
 [[package]]
@@ -6569,7 +6509,6 @@ dependencies = [
  "jsonrpc-core",
  "pallet-mmr-rpc",
  "pallet-transaction-payment-rpc",
- "parity-scale-codec",
  "polkadot-primitives",
  "sc-chain-spec",
  "sc-client-api",
@@ -6578,7 +6517,6 @@ dependencies = [
  "sc-consensus-epochs",
  "sc-finality-grandpa",
  "sc-finality-grandpa-rpc",
- "sc-keystore",
  "sc-rpc",
  "sc-sync-state-rpc",
  "sc-transaction-pool-api",
@@ -6690,10 +6628,8 @@ dependencies = [
  "pallet-balances",
  "pallet-beefy-mmr",
  "pallet-election-provider-multi-phase",
- "pallet-offences",
  "pallet-session",
  "pallet-staking",
- "pallet-staking-reward-curve",
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
@@ -6707,19 +6643,15 @@ dependencies = [
  "serde_json",
  "slot-range-helper",
  "sp-api",
- "sp-application-crypto",
  "sp-core",
  "sp-inherents",
  "sp-io",
- "sp-keyring",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-std",
- "sp-trie",
  "static_assertions",
- "trie-db",
  "xcm",
 ]
 
@@ -6739,14 +6671,10 @@ dependencies = [
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
- "pallet-babe",
  "pallet-balances",
- "pallet-offences",
  "pallet-session",
  "pallet-staking",
- "pallet-staking-reward-curve",
  "pallet-timestamp",
- "pallet-treasury",
  "pallet-vesting",
  "parity-scale-codec",
  "polkadot-primitives",
@@ -6755,9 +6683,7 @@ dependencies = [
  "rustc-hex",
  "sc-keystore",
  "serde",
- "serde_json",
  "sp-api",
- "sp-application-crypto",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -6767,8 +6693,6 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
- "sp-trie",
- "sp-version",
  "xcm",
  "xcm-executor",
 ]
@@ -6899,13 +6823,8 @@ dependencies = [
  "sc-finality-grandpa",
  "sc-service",
  "sc-tracing",
- "sc-transaction-pool",
- "sp-api",
- "sp-consensus",
  "sp-consensus-babe",
- "sp-inherents",
  "sp-keyring",
- "sp-keystore",
  "sp-runtime",
  "structopt",
  "test-runner",
@@ -7210,18 +7129,6 @@ dependencies = [
  "output_vt100",
 ]
 
-[[package]]
-name = "pretty_assertions"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cab0e7c02cf376875e9335e0ba1da535775beb5450d21e1dffca068818ed98b"
-dependencies = [
- "ansi_term 0.12.1",
- "ctor",
- "diff",
- "output_vt100",
-]
-
 [[package]]
 name = "primitive-types"
 version = "0.10.1"
@@ -7886,7 +7793,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "hex-literal",
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
@@ -7908,7 +7814,6 @@ dependencies = [
  "pallet-proxy",
  "pallet-session",
  "pallet-staking",
- "pallet-staking-reward-curve",
  "pallet-sudo",
  "pallet-timestamp",
  "pallet-transaction-payment",
@@ -10097,13 +10002,10 @@ name = "staking-miner"
 version = "0.9.9"
 dependencies = [
  "env_logger 0.9.0",
- "frame-election-provider-support",
  "frame-support",
  "frame-system",
- "hex",
  "jsonrpsee-ws-client",
  "kusama-runtime",
- "lazy_static",
  "log",
  "pallet-balances",
  "pallet-election-provider-multi-phase",
@@ -10120,7 +10022,6 @@ dependencies = [
  "serde_json",
  "sp-core",
  "sp-io",
- "sp-npos-elections",
  "sp-runtime",
  "sp-version",
  "structopt",
@@ -10484,7 +10385,6 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-service",
  "polkadot-test-service",
- "sc-authority-discovery",
  "sc-cli",
  "sc-service",
  "sp-core",
@@ -10507,7 +10407,6 @@ name = "test-parachains"
 version = "0.9.9"
 dependencies = [
  "parity-scale-codec",
- "polkadot-parachain",
  "sp-core",
  "test-parachain-adder",
  "test-parachain-halt",
@@ -11619,7 +11518,6 @@ dependencies = [
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
- "static_assertions",
  "substrate-wasm-builder",
  "tiny-keccak",
  "xcm",
@@ -11739,7 +11637,6 @@ version = "0.9.9"
 dependencies = [
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples",
  "pallet-balances",
  "pallet-transaction-payment",
  "pallet-xcm",
@@ -11825,7 +11722,6 @@ dependencies = [
  "pallet-balances",
  "pallet-xcm",
  "parity-scale-codec",
- "paste 1.0.5",
  "polkadot-core-primitives",
  "polkadot-parachain",
  "polkadot-runtime-parachains",
diff --git a/polkadot/node/client/Cargo.toml b/polkadot/node/client/Cargo.toml
index 5938060dd7f55991e26c2b2b75e4a6c68e1d8860..15daaac2262ea1ea9848dc54306202cc7e3536c2 100644
--- a/polkadot/node/client/Cargo.toml
+++ b/polkadot/node/client/Cargo.toml
@@ -40,6 +40,6 @@ rococo-runtime = { path = "../../runtime/rococo", optional = true }
 polkadot-primitives = { path = "../../primitives" }
 
 [features]
-kusama = [ "kusama-runtime" ]
-rococo = [ "rococo-runtime" ]
-westend = [ "westend-runtime" ]
+kusama = ["kusama-runtime"]
+rococo = ["rococo-runtime"]
+westend = ["westend-runtime"]
diff --git a/polkadot/node/core/approval-voting/Cargo.toml b/polkadot/node/core/approval-voting/Cargo.toml
index 55cd0cd2c98af5e2e4a10ce9f535a20cbac415e5..181782ab4d365097d9c316f7b8e2a7e990cfd4f1 100644
--- a/polkadot/node/core/approval-voting/Cargo.toml
+++ b/polkadot/node/core/approval-voting/Cargo.toml
@@ -23,23 +23,19 @@ polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-jaeger = { path = "../../jaeger" }
 
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["full_crypto"] }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
 [dev-dependencies]
 parking_lot = "0.11.1"
-rand_core = "0.5.1" # should match schnorrkel
+rand_core = "0.5.1" #                                                                       should match schnorrkel
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-maplit = "1.0.2"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
 kvdb-memorydb = "0.10.0"
-rand = "0.8"
diff --git a/polkadot/node/core/dispute-coordinator/Cargo.toml b/polkadot/node/core/dispute-coordinator/Cargo.toml
index 2dd6595227de73c263c4791540400e7470b5cc2f..f33ac2094089293809d6433d38985f95a03ad641 100644
--- a/polkadot/node/core/dispute-coordinator/Cargo.toml
+++ b/polkadot/node/core/dispute-coordinator/Cargo.toml
@@ -22,12 +22,11 @@ sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste
 
 [dev-dependencies]
 kvdb-memorydb = "0.10.0"
-polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers"}
+polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 assert_matches = "1.4.0"
-polkadot-overseer = { path = "../../overseer" }
 
 [features]
 # If not enabled, the dispute coordinator will do nothing.
diff --git a/polkadot/node/metered-channel/Cargo.toml b/polkadot/node/metered-channel/Cargo.toml
index ead1dc6b44b0548b74e383e00eb402143a93a55b..3cc44ca894e66614d7727ad9c3396df6362a40fe 100644
--- a/polkadot/node/metered-channel/Cargo.toml
+++ b/polkadot/node/metered-channel/Cargo.toml
@@ -11,5 +11,4 @@ futures-timer = "3.0.2"
 derive_more = "0.99"
 
 [dev-dependencies]
-assert_matches = "1.4.0"
 futures = { version = "0.3.15", features = ["thread-pool"] }
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index adc7fa362244fc3fc3b1ff2e21c910e29b7ffbc3..b846c6f4236f255b6ecfed28f6dc1cce63d2a65e 100644
--- a/polkadot/node/metrics/Cargo.toml
+++ b/polkadot/node/metrics/Cargo.toml
@@ -6,16 +6,11 @@ edition = "2018"
 description = "Subsystem traits and message definitions"
 
 [dependencies]
-async-trait = "0.1.51"
 futures = "0.3.15"
 futures-timer = "3.0.2"
 
-metered-channel = { path = "../metered-channel"}
+metered-channel = { path = "../metered-channel" }
 
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 jemalloc-ctl = { version = "0.3.3", optional = true }
diff --git a/polkadot/node/network/availability-distribution/Cargo.toml b/polkadot/node/network/availability-distribution/Cargo.toml
index 8a9a666a7c8567a394f52dc9422b9181537daeea..95ab81659f470a34da61360d96f8994e8a8523ec 100644
--- a/polkadot/node/network/availability-distribution/Cargo.toml
+++ b/polkadot/node/network/availability-distribution/Cargo.toml
@@ -7,16 +7,14 @@ edition = "2018"
 [dependencies]
 futures = "0.3.15"
 tracing = "0.1.26"
-parity-scale-codec = { version = "2.0.0", features = ["std"]  }
+parity-scale-codec = { version = "2.0.0", features = ["std"] }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-erasure-coding = { path = "../../../erasure-coding" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-network-protocol = { path = "../../network/protocol" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-primitives = { path = "../../primitives" }
-polkadot-node-core-runtime-api = { path = "../../core/runtime-api" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"]  }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 thiserror = "1.0.26"
 rand = "0.8.3"
@@ -31,4 +29,3 @@ sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
 futures-timer = "3.0.2"
 assert_matches = "1.4.0"
-maplit = "1.0"
diff --git a/polkadot/node/network/dispute-distribution/Cargo.toml b/polkadot/node/network/dispute-distribution/Cargo.toml
index e2401e8b2cb1968139317a69f0539655e403c99c..329bd552bdb06379e257d08af03b070b52be2886 100644
--- a/polkadot/node/network/dispute-distribution/Cargo.toml
+++ b/polkadot/node/network/dispute-distribution/Cargo.toml
@@ -8,32 +8,25 @@ edition = "2018"
 futures = "0.3.15"
 tracing = "0.1.26"
 derive_more = "0.99.14"
-parity-scale-codec = { version = "2.0.0", features = ["std"]  }
+parity-scale-codec = { version = "2.0.0", features = ["std"] }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-erasure-coding = { path = "../../../erasure-coding" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-network-protocol = { path = "../../network/protocol" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-primitives = { path = "../../primitives" }
-polkadot-node-core-runtime-api = { path = "../../core/runtime-api" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"]  }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 thiserror = "1.0.26"
-rand = "0.8.3"
 lru = "0.6.6"
 
 [dev-dependencies]
 async-trait = "0.1.51"
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = {git = "https://github.com/paritytech/substrate", branch = "master" }
 futures-timer = "3.0.2"
 assert_matches = "1.4.0"
-maplit = "1.0"
-smallvec = "1.6.1"
 lazy_static = "1.4.0"
diff --git a/polkadot/node/network/gossip-support/Cargo.toml b/polkadot/node/network/gossip-support/Cargo.toml
index 9a6ef8a060fe49d6a52eeda93376513904923be0..35bb5d3d8d0d1b8b1e3381cc37be385efcec517c 100644
--- a/polkadot/node/network/gossip-support/Cargo.toml
+++ b/polkadot/node/network/gossip-support/Cargo.toml
@@ -20,7 +20,6 @@ rand_chacha = { version = "0.3.1", default-features = false }
 tracing = "0.1.26"
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 8547e87ceddb086b17fcca74c136a9a50b56e4f7..9478d14320c6a22d194558df94edb7b04dfcd260 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-async-trait = "0.1.51"
 client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 futures = "0.3.15"
@@ -26,7 +25,6 @@ metered-channel = { path = "../metered-channel" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 futures = { version = "0.3.15", features = ["thread-pool"] }
 femme = "2.1.1"
-kv-log-macro = "1.0.7"
 assert_matches = "1.4.0"
 
 [features]
diff --git a/polkadot/node/overseer/all-subsystems-gen/Cargo.toml b/polkadot/node/overseer/all-subsystems-gen/Cargo.toml
index 2c227c308b419f66f252a09497a6077845e3344d..7ad163d3f9d0641c964e7b611828e23389fc461b 100644
--- a/polkadot/node/overseer/all-subsystems-gen/Cargo.toml
+++ b/polkadot/node/overseer/all-subsystems-gen/Cargo.toml
@@ -12,7 +12,6 @@ proc-macro = true
 syn = { version = "1.0.60", features = ["full", "extra-traits"] }
 quote = "1.0.9"
 proc-macro2 = "1.0.24"
-assert_matches = "1.5.0"
 
 [dev-dependencies]
 trybuild = "1.0.45"
diff --git a/polkadot/node/primitives/Cargo.toml b/polkadot/node/primitives/Cargo.toml
index 2cd7633503f525c8617c7136910397638efab865..e37ec35ff50f45a7cd5615c4c25ef8d8867d3003 100644
--- a/polkadot/node/primitives/Cargo.toml
+++ b/polkadot/node/primitives/Cargo.toml
@@ -9,19 +9,16 @@ description = "Primitives types for the Node-side"
 bounded-vec = "0.4"
 futures = "0.3.15"
 polkadot-primitives = { path = "../../primitives" }
-polkadot-statement-table = { path = "../../statement-table" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob  = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" }
 polkadot-parachain = { path = "../../parachain", default-features = false }
 schnorrkel = "0.9.1"
 thiserror = "1.0.26"
-tracing = "0.1.26"
 serde = { version = "1.0.130", features = ["derive"] }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
diff --git a/polkadot/node/subsystem-test-helpers/Cargo.toml b/polkadot/node/subsystem-test-helpers/Cargo.toml
index 333037d76cf26eaed42037a4dbd82573f68a7de4..dbb39651ae072376d8a9e74adf782d847f3d1774 100644
--- a/polkadot/node/subsystem-test-helpers/Cargo.toml
+++ b/polkadot/node/subsystem-test-helpers/Cargo.toml
@@ -8,23 +8,15 @@ description = "Subsystem traits and message definitions"
 [dependencies]
 async-trait = "0.1.51"
 futures = "0.3.15"
-futures-timer = "3.0.2"
-tracing = "0.1.26"
-parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 parking_lot = "0.11.1"
-pin-project = "1.0.8"
-polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
-polkadot-statement-table = { path = "../../statement-table" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-smallvec = "1.6.1"
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master"}
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [dev-dependencies]
 polkadot-overseer = { path = "../overseer" }
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index be1bb1ab8e0f1372a491abc812882d81effe5efb..456e1758e490304bd624e1a5b973b269c9792a5c 100644
--- a/polkadot/node/subsystem-types/Cargo.toml
+++ b/polkadot/node/subsystem-types/Cargo.toml
@@ -6,17 +6,8 @@ edition = "2018"
 description = "Subsystem traits and message definitions"
 
 [dependencies]
-async-std = "1.8.0"
-async-trait = "0.1.51"
 derive_more = "0.99.11"
 futures = "0.3.12"
-futures-timer = "3.0.2"
-mick-jaeger = "0.1.2"
-lazy_static = "1.4"
-tracing = "0.1.26"
-parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-parking_lot = "0.11.1"
-pin-project = "1.0.8"
 polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
@@ -25,13 +16,5 @@ polkadot-node-jaeger = { path = "../jaeger" }
 polkadot-overseer-gen = { path = "../overseer/overseer-gen" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
 smallvec = "1.6.1"
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
 thiserror = "1.0.26"
-log = "0.4.13"
-
-[dev-dependencies]
-assert_matches = "1.4.0"
-async-trait = "0.1.51"
-futures = { version = "0.3.12", features = ["thread-pool"] }
-polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
diff --git a/polkadot/node/subsystem-util/Cargo.toml b/polkadot/node/subsystem-util/Cargo.toml
index ea4deb1ad3910fea099c987b4b6b31a05640d7b8..2104d643262659be7cc314afffe1932927abf2bc 100644
--- a/polkadot/node/subsystem-util/Cargo.toml
+++ b/polkadot/node/subsystem-util/Cargo.toml
@@ -8,10 +8,8 @@ description = "Subsystem traits and message definitions"
 [dependencies]
 async-trait = "0.1.51"
 futures = "0.3.15"
-futures-timer = "3.0.2"
 itertools = "0.10"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-parking_lot = { version = "0.11.1", optional = true }
 pin-project = "1.0.8"
 rand = "0.8.3"
 thiserror = "1.0.26"
@@ -19,26 +17,21 @@ tracing = "0.1.26"
 derive_more = "0.99.11"
 lru = "0.6.6"
 
-polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" }
 polkadot-node-jaeger = { path = "../jaeger" }
 polkadot-node-metrics = { path = "../metrics" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-overseer = { path = "../overseer" }
-metered-channel = { path = "../metered-channel"}
+metered-channel = { path = "../metered-channel" }
 
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [dev-dependencies]
 assert_matches = "1.4.0"
-async-trait = "0.1.51"
 env_logger = "0.9.0"
 futures = { version = "0.3.15", features = ["thread-pool"] }
 log = "0.4.13"
-parking_lot = "0.11.1"
 polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
diff --git a/polkadot/node/test/polkadot-simnet/common/Cargo.toml b/polkadot/node/test/polkadot-simnet/common/Cargo.toml
index 739e2cbae07179d89be0322569273775b6a7ab7a..e004790866175fc51437a7c749a4c369dbe36f5b 100644
--- a/polkadot/node/test/polkadot-simnet/common/Cargo.toml
+++ b/polkadot/node/test/polkadot-simnet/common/Cargo.toml
@@ -18,18 +18,13 @@ sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch =
 sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master"  }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 polkadot-primitives = { path = "../../../../primitives" }
 polkadot-cli = { path = "../../../../cli", features = ["cli"] }
diff --git a/polkadot/parachain/test-parachains/Cargo.toml b/polkadot/parachain/test-parachains/Cargo.toml
index 9589be294775aa1a6ca8bfdd11b30cc448a4b2f5..13b9febd2f1cd047646466a7bb27f49132928db1 100644
--- a/polkadot/parachain/test-parachains/Cargo.toml
+++ b/polkadot/parachain/test-parachains/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2018"
 tiny-keccak = "2.0.2"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 
-parachain = { package = "polkadot-parachain", path = ".." }
 adder = { package = "test-parachain-adder", path = "adder" }
 halt = { package = "test-parachain-halt", path = "halt" }
 
@@ -17,8 +16,5 @@ halt = { package = "test-parachain-halt", path = "halt" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]
-default = [ "std" ]
-std = [
-	"adder/std",
-	"halt/std",
-]
+default = ["std"]
+std = ["adder/std", "halt/std"]
diff --git a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
index e4d44a756cbc366e1a26ae0c9804217fc4dfec1f..674ea62cb9afd8dd744dea5648d5cf09e84ab0b0 100644
--- a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
@@ -23,13 +23,12 @@ structopt = "0.3.21"
 test-parachain-adder = { path = ".." }
 polkadot-primitives = { path = "../../../../primitives" }
 polkadot-cli = { path = "../../../../cli" }
-polkadot-service = { path = "../../../../node/service", features = [ "rococo-native" ] }
+polkadot-service = { path = "../../../../node/service", features = ["rococo-native"] }
 polkadot-node-primitives = { path = "../../../../node/primitives" }
 polkadot-node-subsystem = { path = "../../../../node/subsystem" }
 
 sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # This one is tricky. Even though it is not used directly by the collator, we still need it for the
diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml
index 69f8e9acf846e787e8a117a488014fdf94c05429..9b106e864cf780dbc477d5b9931cf91b66c83243 100644
--- a/polkadot/primitives/Cargo.toml
+++ b/polkadot/primitives/Cargo.toml
@@ -27,11 +27,7 @@ bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 hex-literal = "0.3.3"
 parity-util-mem = { version = "0.10.0", default-features = false, optional = true }
-thiserror = "1.0.26"
 
-[dev-dependencies]
-sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pretty_assertions = "0.7.2"
 
 [features]
 default = ["std"]
diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml
index 32d63cc57f7acb56faced91b1e91caafce698d10..775afe61dfb7563d221e6de6e1a3955c8e4d6337 100644
--- a/polkadot/rpc/Cargo.toml
+++ b/polkadot/rpc/Cargo.toml
@@ -21,13 +21,11 @@ sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branc
 sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 txpool-api = { package = "sc-transaction-pool-api", git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-mmr-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-parity-scale-codec = { version = "2.0.0", default-features = false }
 sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
 beefy-gadget = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
 beefy-gadget-rpc = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
index 35d7711038935830afb2f16d953133959019cdad..870e51fe10dbe4f72ebdfbe94a14cb0a852a2cd2 100644
--- a/polkadot/runtime/common/Cargo.toml
+++ b/polkadot/runtime/common/Cargo.toml
@@ -28,17 +28,16 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "m
 pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-beefy-mmr = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
 
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features=false, optional = true }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
 
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 libsecp256k1 = { version = "0.6.0", default-features = false }
@@ -49,15 +48,10 @@ xcm = { path = "../../xcm", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.3"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-trie-db = "0.22.3"
 serde_json = "1.0.66"
 libsecp256k1 = "0.6.0"
 
diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml
index 31d574e655906ba1465409661197480ba5030814..3113ee166a701a4356b268676eec22384691cae7 100644
--- a/polkadot/runtime/parachains/Cargo.toml
+++ b/polkadot/runtime/parachains/Cargo.toml
@@ -9,7 +9,7 @@ bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
-serde = { version = "1.0.130", features = [ "derive" ], optional = true }
+serde = { version = "1.0.130", features = ["derive"], optional = true }
 derive_more = "0.99.14"
 bitflags = "1.3.2"
 
@@ -29,10 +29,9 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "m
 pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
 
 xcm = { package = "xcm", path = "../../xcm", default-features = false }
@@ -46,14 +45,7 @@ rand_chacha = { version = "0.3.1", default-features = false }
 futures = "0.3.15"
 hex-literal = "0.3.3"
 keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "master" }
-serde_json = "1.0.66"
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 
diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml
index cb1310e2041e51956799a5103659ef2ff0af08fa..ed706e19bd348d3c4dce619fa506d78f1fe75638 100644
--- a/polkadot/runtime/rococo/Cargo.toml
+++ b/polkadot/runtime/rococo/Cargo.toml
@@ -10,7 +10,6 @@ parity-scale-codec = { version = "2.2.0", default-features = false, features = [
 serde = { version = "1.0.130", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.6.1"
-hex-literal = "0.3.3"
 log = { version = "0.4.14", default-features = false }
 
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -48,7 +47,6 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate",
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -56,7 +54,7 @@ pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "mast
 pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index 6d348e51d26cd3b9789874bb8a98f4c980b4af8e..00a8ad4c8b7645f92da9ca44cc914bd0632bf045 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -13,7 +13,6 @@ rustc-hex = { version = "2.1.0", default-features = false }
 serde = { version = "1.0.130", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.6.1"
-static_assertions = "1.1.0"
 
 authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -35,7 +34,7 @@ sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch =
 frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/polkadot/scripts/gitlab/lingua.dic b/polkadot/scripts/gitlab/lingua.dic
index c9fec231386d533d967a1132d68d131d225c6660..5d137e088ea3e16e240bb6599cd6648e2410f7a7 100644
--- a/polkadot/scripts/gitlab/lingua.dic
+++ b/polkadot/scripts/gitlab/lingua.dic
@@ -1,5 +1,6 @@
 150
 accessor/MS
+AccountId
 activations
 acyclic
 adversary/SM
@@ -133,6 +134,7 @@ malus
 MB/M
 Mbit
 merkle/MS
+Merklized
 metadata/M
 middleware/MS
 Millau
@@ -153,6 +155,7 @@ natively
 NFA
 NFT/SM
 nonces
+no_std
 NTB
 offboard/DMSG
 onboard/DMSG
@@ -197,6 +200,7 @@ PVF/S
 README/MS
 redhat/M
 register/CD
+relayer
 repo/MS
 reservable
 responder/SM
diff --git a/polkadot/utils/staking-miner/Cargo.toml b/polkadot/utils/staking-miner/Cargo.toml
index 329081372d4af381b114b05f32f2b56827274d77..cc1cd5486fb615e60ea00e6881cf9e3f868fc468 100644
--- a/polkadot/utils/staking-miner/Cargo.toml
+++ b/polkadot/utils/staking-miner/Cargo.toml
@@ -13,8 +13,6 @@ structopt = "0.3.0"
 jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = ["tokio1"] }
 serde_json = "1.0"
 serde = "1.0.130"
-hex = "0.4.3"
-lazy_static = "1.4.0"
 paste = "1.0.5"
 thiserror = "1.0.26"
 
@@ -24,13 +22,11 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/xcm/xcm-builder/Cargo.toml b/polkadot/xcm/xcm-builder/Cargo.toml
index 8eb82f0f2626bda3162518ae6842d3aed3a1fdbd..5bef78b7d7bdcc9e599bcc37bfcbb8c8adb185de 100644
--- a/polkadot/xcm/xcm-builder/Cargo.toml
+++ b/polkadot/xcm/xcm-builder/Cargo.toml
@@ -6,7 +6,6 @@ description = "Tools & types for building with XCM and its executor."
 version = "0.9.9"
 
 [dependencies]
-impl-trait-for-tuples = "0.2.0"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 xcm = { path = "..", default-features = false }
 xcm-executor = { path = "../xcm-executor", default-features = false }
diff --git a/polkadot/xcm/xcm-simulator/example/Cargo.toml b/polkadot/xcm/xcm-simulator/example/Cargo.toml
index d7e8710e26b91598c27c28ac318dab2197d68cfb..5a8f1ac0b86725fdbcc65e53b0cd777bc2dc020c 100644
--- a/polkadot/xcm/xcm-simulator/example/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/example/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2018"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-paste = "1.0.5"
 
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -22,6 +21,6 @@ xcm-simulator = { path = "../" }
 xcm-executor = { path = "../../xcm-executor" }
 xcm-builder = { path = "../../xcm-builder" }
 pallet-xcm = { path = "../../pallet-xcm" }
-polkadot-core-primitives = { path = "../../../core-primitives"}
+polkadot-core-primitives = { path = "../../../core-primitives" }
 polkadot-runtime-parachains = { path = "../../../runtime/parachains" }
 polkadot-parachain = { path = "../../../parachain" }