diff --git a/Cargo.lock b/Cargo.lock
index 61180c98bc84..ca38cdab722a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -204,16 +204,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
-[[package]]
-name = "async-attributes"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "async-channel"
 version = "1.5.1"
@@ -303,7 +293,6 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f9f84f1280a2b436a2c77c2582602732b6c2f4321d5494d6e799e6c367859a8"
 dependencies = [
- "async-attributes",
  "async-channel",
  "async-global-executor",
  "async-io",
@@ -5579,7 +5568,7 @@ dependencies = [
  "frame-benchmarking-cli",
  "futures 0.3.13",
  "log",
- "polkadot-node-core-pvf",
+ "polkadot-parachain",
  "polkadot-service",
  "sc-cli",
  "sc-service",
@@ -5685,7 +5674,6 @@ name = "polkadot-node-collation-generation"
 version = "0.1.0"
 dependencies = [
  "futures 0.3.13",
- "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -5693,7 +5681,6 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-core",
- "sp-maybe-compressed-blob",
  "thiserror",
  "tracing",
 ]
@@ -5823,10 +5810,8 @@ name = "polkadot-node-core-candidate-validation"
 version = "0.1.0"
 dependencies = [
  "assert_matches",
- "async-trait",
  "futures 0.3.13",
  "parity-scale-codec",
- "polkadot-node-core-pvf",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -5835,7 +5820,6 @@ dependencies = [
  "polkadot-primitives",
  "sp-core",
  "sp-keyring",
- "sp-maybe-compressed-blob",
  "tracing",
 ]
 
@@ -5895,38 +5879,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "polkadot-node-core-pvf"
-version = "0.1.0"
-dependencies = [
- "always-assert",
- "assert_matches",
- "async-process",
- "async-std",
- "futures 0.3.13",
- "futures-timer 3.0.2",
- "hex-literal",
- "libc",
- "parity-scale-codec",
- "pin-project 1.0.4",
- "polkadot-core-primitives",
- "polkadot-parachain",
- "rand 0.8.3",
- "sc-executor",
- "sc-executor-common",
- "sc-executor-wasmtime",
- "slotmap",
- "sp-core",
- "sp-externalities",
- "sp-io",
- "sp-wasm-interface",
- "tempfile",
- "test-parachain-adder",
- "test-parachain-halt",
- "tracing",
- "wasmtime-jit",
-]
-
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.1.0"
@@ -5992,7 +5944,6 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-vrf",
  "sp-core",
- "sp-maybe-compressed-blob",
  "sp-runtime",
  "thiserror",
  "zstd",
@@ -6108,13 +6059,25 @@ name = "polkadot-parachain"
 version = "0.8.30"
 dependencies = [
  "derive_more",
+ "futures 0.3.13",
+ "libc",
+ "log",
  "parity-scale-codec",
  "parity-util-mem",
+ "parking_lot 0.11.1",
  "polkadot-core-primitives",
+ "raw_sync",
+ "sc-executor",
  "serde",
+ "shared_memory",
  "sp-core",
+ "sp-externalities",
+ "sp-io",
  "sp-runtime",
  "sp-std",
+ "sp-wasm-interface",
+ "static_assertions",
+ "thiserror",
 ]
 
 [[package]]
@@ -7053,6 +7016,19 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "raw_sync"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a34bde3561f980a51c70495164200569a11662644fe5af017f0b5d7015688cc"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "nix",
+ "rand 0.8.3",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -8713,6 +8689,20 @@ dependencies = [
  "loom",
 ]
 
+[[package]]
+name = "shared_memory"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b854a362375dfe8ab12ea8a98228040d37293c988f85fbac9fa0f83336387966"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "nix",
+ "quick-error 2.0.0",
+ "rand 0.8.3",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "shlex"
 version = "0.1.1"
@@ -8773,15 +8763,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "slotmap"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3003725ae562cf995f3dc82bb99e70926e09000396816765bb6d7adbe740b1"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "smallvec"
 version = "0.6.13"
@@ -9872,7 +9853,6 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "polkadot-cli",
- "polkadot-node-core-pvf",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-parachain",