diff --git a/Cargo.lock b/Cargo.lock
index 06e7f9521e..e28f83688a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1225,7 +1225,6 @@ dependencies = [
  "sp-std",
  "strum 0.25.0",
  "strum_macros 0.25.2",
- "xcm",
 ]
 
 [[package]]
@@ -5313,8 +5312,6 @@ dependencies = [
  "polkadot-runtime-parachains",
  "runtime-common",
  "scale-info",
- "serde",
- "smallvec",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
@@ -5401,8 +5398,6 @@ dependencies = [
  "polkadot-runtime-parachains",
  "runtime-common",
  "scale-info",
- "serde",
- "smallvec",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
@@ -6533,14 +6528,10 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal 0.3.4",
- "log",
  "orml-traits",
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "serde",
- "smallvec",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -6738,7 +6729,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex",
  "hex-literal 0.4.1",
  "pallet-balances",
  "pallet-bridge",
@@ -6967,7 +6957,6 @@ name = "pallet-evm-address"
 version = "0.1.0"
 dependencies = [
  "fp-evm",
- "frame-benchmarking",
  "frame-support",
  "frame-system",
  "hex-literal 0.4.1",
@@ -7081,15 +7070,12 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex",
- "log",
  "pallet-balances",
  "pallet-group",
  "pallet-teerex",
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -7321,16 +7307,13 @@ dependencies = [
  "env_logger 0.9.3",
  "frame-support",
  "frame-system",
- "log",
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "serde",
  "sp-core",
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
@@ -7479,7 +7462,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal 0.4.1",
  "log",
  "pallet-balances",
  "pallet-teerex",
@@ -7634,7 +7616,6 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "serde",
  "sgx-verify",
  "sp-core",
  "sp-externalities",
@@ -7768,15 +7749,12 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex",
- "log",
  "pallet-balances",
  "pallet-group",
  "pallet-teerex",
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -10108,8 +10086,6 @@ dependencies = [
  "polkadot-runtime-parachains",
  "runtime-common",
  "scale-info",
- "serde",
- "smallvec",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
@@ -10299,7 +10275,6 @@ dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
- "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
@@ -10315,7 +10290,6 @@ dependencies = [
  "pallet-membership",
  "pallet-multisig",
  "pallet-teerex",
- "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-vesting",
@@ -11817,7 +11791,6 @@ dependencies = [
  "serde",
  "serde_json",
  "sp-core",
- "sp-io",
  "sp-std",
  "teerex-primitives",
  "webpki 0.21.0",
@@ -11917,9 +11890,6 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
@@ -13159,7 +13129,6 @@ name = "teeracle-primitives"
 version = "0.1.0"
 dependencies = [
  "common-primitives",
- "sp-std",
  "substrate-fixed 0.5.9 (git+https://github.com/encointer/substrate-fixed.git?tag=v0.5.9)",
 ]
 
@@ -13167,13 +13136,10 @@ dependencies = [
 name = "teerex-primitives"
 version = "0.1.0"
 dependencies = [
- "common-primitives",
  "hex-literal 0.4.1",
  "parity-scale-codec",
  "scale-info",
- "serde",
  "sp-core",
- "sp-io",
  "sp-std",
 ]
 
@@ -13210,7 +13176,6 @@ name = "test-utils"
 version = "0.1.0"
 dependencies = [
  "hex-literal 0.4.1",
- "log",
  "teerex-primitives",
 ]
 
@@ -13784,7 +13749,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
  "digest 0.10.7",
- "rand 0.7.3",
+ "rand 0.8.5",
  "static_assertions",
 ]
 
diff --git a/pallets/bridge-transfer/Cargo.toml b/pallets/bridge-transfer/Cargo.toml
index d3fbf8a4ab..e25a447163 100644
--- a/pallets/bridge-transfer/Cargo.toml
+++ b/pallets/bridge-transfer/Cargo.toml
@@ -26,8 +26,6 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
 pallet-bridge = { path = "../bridge", default-features = false }
 pallet-parachain-staking = { path = "../parachain-staking", default-features = false }
 
-hex = { version = "0.4", default-features = false }
-
 [dev-dependencies]
 hex-literal = "0.4"
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
diff --git a/pallets/evm-address/Cargo.toml b/pallets/evm-address/Cargo.toml
index aafd29afd4..b20aaeac61 100644
--- a/pallets/evm-address/Cargo.toml
+++ b/pallets/evm-address/Cargo.toml
@@ -15,7 +15,6 @@ scale-info = { version = "2.9.0", default-features = false, features = ["derive"
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false, optional = true }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 
@@ -34,7 +33,6 @@ fp-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0
 [features]
 default = ["std"]
 runtime-benchmarks = [
-    "frame-benchmarking/runtime-benchmarks",
     "frame-support/runtime-benchmarks",
     "frame-system/runtime-benchmarks",
     "pallet-ethereum/runtime-benchmarks",
@@ -45,6 +43,5 @@ std = [
     "sp-runtime/std",
     "frame-support/std",
     "frame-system/std",
-    "frame-benchmarking?/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/identity-management/Cargo.toml b/pallets/identity-management/Cargo.toml
index 6aaad6e5bd..298bb63e55 100644
--- a/pallets/identity-management/Cargo.toml
+++ b/pallets/identity-management/Cargo.toml
@@ -9,12 +9,10 @@ version = '0.1.0'
 [dependencies]
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-log = { version = "0.4", default-features = false }
 pallet-teerex = { path = "../teerex", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
 # primitives
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
@@ -25,7 +23,6 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
 
 # benchmarking
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false, optional = true }
-hex = { version = "0.4", default-features = false }
 test-utils = { path = "../test-utils", default-features = false, optional = true }
 
 # local
@@ -58,7 +55,6 @@ std = [
     "sp-runtime/std",
     "sp-io/std",
     "sp-core/std",
-    "sp-arithmetic/std",
     "frame-support/std",
     "frame-system/std",
     "frame-benchmarking?/std",
diff --git a/pallets/parentchain/Cargo.toml b/pallets/parentchain/Cargo.toml
index 0c534508de..dc48c83055 100644
--- a/pallets/parentchain/Cargo.toml
+++ b/pallets/parentchain/Cargo.toml
@@ -10,9 +10,7 @@ edition = "2021"
 
 [dependencies]
 codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
-log = { version = "0.4", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", features = ["derive"], optional = true }
 
 # substrate dependencies
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
@@ -20,7 +18,6 @@ frame-system = { default-features = false, package = "frame-system", git = "http
 sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 [dev-dependencies]
 env_logger = "0.9.0"
@@ -31,16 +28,13 @@ pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch
 default = ["std"]
 std = [
     "codec/std",
-    "log/std",
     "scale-info/std",
-    "serde",
     # substrate dependencies
     "frame-support/std",
     "frame-system/std",
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
 ]
 
 try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/sidechain/Cargo.toml b/pallets/sidechain/Cargo.toml
index c302f9cff7..b6f965ae22 100644
--- a/pallets/sidechain/Cargo.toml
+++ b/pallets/sidechain/Cargo.toml
@@ -30,7 +30,6 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr
 
 # benchmarking
 frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-hex-literal = { version = "0.4.1", optional = true }
 pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 test-utils = { path = "../test-utils", default-features = false, optional = true }
 
@@ -38,7 +37,6 @@ test-utils = { path = "../test-utils", default-features = false, optional = true
 env_logger = "0.9.0"
 externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-hex-literal = "0.4.1"
 pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 test-utils = { path = "../test-utils" }
@@ -65,7 +63,6 @@ std = [
 ]
 runtime-benchmarks = [
     "frame-benchmarking",
-    "hex-literal",
     "pallet-balances",
     "pallet-timestamp/runtime-benchmarks",
     "test-utils",
diff --git a/pallets/teerex/Cargo.toml b/pallets/teerex/Cargo.toml
index 39b2aafa9f..bb9f947a2e 100644
--- a/pallets/teerex/Cargo.toml
+++ b/pallets/teerex/Cargo.toml
@@ -12,7 +12,6 @@ edition = "2021"
 codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
 log = { version = "0.4", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", features = ["derive"], optional = true }
 
 # local
 sgx-verify = { path = "./sgx-verify", default-features = false }
@@ -48,7 +47,6 @@ std = [
     "codec/std",
     "log/std",
     "scale-info/std",
-    "serde",
     # local
     "sgx-verify/std",
     "teerex-primitives/std",
diff --git a/pallets/teerex/sgx-verify/Cargo.toml b/pallets/teerex/sgx-verify/Cargo.toml
index ca7495f5c4..5aa18d8426 100644
--- a/pallets/teerex/sgx-verify/Cargo.toml
+++ b/pallets/teerex/sgx-verify/Cargo.toml
@@ -27,7 +27,6 @@ teerex-primitives = { path = "../../../primitives/teerex", default-features = fa
 # substrate dependencies
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 [dev-dependencies]
@@ -52,6 +51,5 @@ std = [
     # substrate
     "frame-support/std",
     "sp-core/std",
-    "sp-io/std",
     "sp-std/std",
 ]
diff --git a/pallets/teerex/sgx-verify/fuzz/Cargo.toml b/pallets/teerex/sgx-verify/fuzz/Cargo.toml
index 8fe43fc685..1db43f8955 100644
--- a/pallets/teerex/sgx-verify/fuzz/Cargo.toml
+++ b/pallets/teerex/sgx-verify/fuzz/Cargo.toml
@@ -10,7 +10,6 @@ cargo-fuzz = true
 [dependencies]
 base64 = { version = "0.13", default-features = false, features = ["alloc"] }
 codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
-hex-literal = "0.3.4"
 libfuzzer-sys = "0.4"
 serde_json = { version = "1.0" }
 webpki = { default-features = false, git = "https://github.com/scs/webpki-nostd.git", branch = "master" }
diff --git a/pallets/test-utils/Cargo.toml b/pallets/test-utils/Cargo.toml
index 0f64731192..ee64980c84 100644
--- a/pallets/test-utils/Cargo.toml
+++ b/pallets/test-utils/Cargo.toml
@@ -10,7 +10,6 @@ edition = "2021"
 
 [dependencies]
 hex-literal = { version = "0.4.1" }
-log = { version = "0.4", default-features = false }
 
 [dependencies.teerex-primitives]
 default-features = false
@@ -21,6 +20,5 @@ path = "../../primitives/teerex"
 [features]
 default = ['std']
 std = [
-    "log/std",
     "teerex-primitives/std",
 ]
diff --git a/pallets/vc-management/Cargo.toml b/pallets/vc-management/Cargo.toml
index 3549ab21e8..f5fd7ebd45 100644
--- a/pallets/vc-management/Cargo.toml
+++ b/pallets/vc-management/Cargo.toml
@@ -9,11 +9,9 @@ version = '0.1.0'
 [dependencies]
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-log = { version = "0.4", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
 # primitives
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
@@ -28,7 +26,6 @@ teerex-primitives = { path = "../../primitives/teerex", default-features = false
 
 # benchmarking
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false, optional = true }
-hex = { version = "0.4", default-features = false }
 test-utils = { path = "../test-utils", default-features = false, optional = true }
 
 [dev-dependencies]
@@ -54,7 +51,6 @@ std = [
     "sp-runtime/std",
     "sp-io/std",
     "sp-core/std",
-    "sp-arithmetic/std",
     "frame-support/std",
     "frame-system/std",
     "frame-benchmarking?/std",
diff --git a/pallets/xcm-asset-manager/Cargo.toml b/pallets/xcm-asset-manager/Cargo.toml
index a36c3a6207..b81a027fc6 100644
--- a/pallets/xcm-asset-manager/Cargo.toml
+++ b/pallets/xcm-asset-manager/Cargo.toml
@@ -6,11 +6,7 @@ version = "0.1.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-hex-literal = { version = '0.3.4' }
-log = { version = "0.4", default-features = false }
 scale-info = { version = "2.4.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", optional = true, features = ["derive"] }
-smallvec = "1.8.0"
 
 # Substrate Dependencies
 ## Substrate Primitive Dependencies
@@ -43,7 +39,6 @@ std = [
     "codec/std",
     "orml-traits/std",
     "scale-info/std",
-    "serde",
     "sp-io/std",
     "sp-runtime/std",
     "sp-std/std",
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index fdd76b3d3f..f1d69a3943 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -16,7 +16,6 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39", default-features = false }
 
 [features]
 default = ["std"]
@@ -28,6 +27,5 @@ std = [
     "sp-core/std",
     "sp-runtime/std",
     "sp-std/std",
-    "xcm/std",
     "ring/std",
 ]
diff --git a/primitives/sidechain/Cargo.toml b/primitives/sidechain/Cargo.toml
index f2dfce16fb..03807f9271 100644
--- a/primitives/sidechain/Cargo.toml
+++ b/primitives/sidechain/Cargo.toml
@@ -15,9 +15,6 @@ serde = { version = "1.0", default-features = false }
 
 # substrate dependencies
 sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 
 [features]
@@ -31,7 +28,4 @@ std = [
     "serde/std",
     # substrate
     "sp-core/std",
-    "sp-io/std",
-    "sp-runtime/std",
-    "sp-std/std",
 ]
diff --git a/primitives/teeracle/Cargo.toml b/primitives/teeracle/Cargo.toml
index b4569fa60f..83b443bf43 100644
--- a/primitives/teeracle/Cargo.toml
+++ b/primitives/teeracle/Cargo.toml
@@ -14,14 +14,10 @@ common-primitives = { path = "../common", default-features = false }
 # encointer
 substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" }
 
-# substrate
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-
 
 [features]
 default = ["std"]
 std = [
     "common-primitives/std",
     "substrate-fixed/std",
-    "sp-std/std",
 ]
diff --git a/primitives/teerex/Cargo.toml b/primitives/teerex/Cargo.toml
index 5cdb6f713a..7d4a79b35c 100644
--- a/primitives/teerex/Cargo.toml
+++ b/primitives/teerex/Cargo.toml
@@ -9,13 +9,10 @@ version = "0.1.0"
 
 [dependencies]
 codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
-common-primitives = { path = "../common", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", default-features = false }
 
 # substrate dependencies
 sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 [dev-dependencies]
@@ -25,11 +22,8 @@ hex-literal = "0.4.1"
 default = ["std"]
 std = [
     "codec/std",
-    "common-primitives/std",
     "scale-info/std",
-    "serde/std",
     # substrate
     "sp-core/std",
-    "sp-io/std",
     "sp-std/std",
 ]
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 479f65d7ce..3a55af4291 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -17,7 +17,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features
 sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39" }
 
 ## Substrate FRAME Dependencies
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false, optional = true }
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39" }
 frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39" }
 
@@ -49,7 +48,6 @@ pallet-asset-manager = { path = "../../pallets/xcm-asset-manager", default-featu
 pallet-extrinsic-filter = { path = "../../pallets/extrinsic-filter", default-features = false }
 pallet-group = { path = "../../pallets/group", default-features = false }
 pallet-teerex = { path = "../../pallets/teerex", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 teerex-primitives = { path = "../../primitives/teerex", default-features = false, optional = true }
 
 # Dev dependencies
@@ -76,7 +74,6 @@ std = [
     "sp-io/std",
     "sp-std/std",
     "sp-runtime/std",
-    "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
     "pallet-authorship/std",
@@ -85,7 +82,6 @@ std = [
     "pallet-group/std",
     "pallet-multisig/std",
     "pallet-membership/std",
-    "pallet-timestamp/std",
     "pallet-transaction-payment/std",
     "pallet-treasury/std",
     "pallet-vesting/std",
@@ -109,7 +105,6 @@ runtime-benchmarks = [
     "sp-runtime/runtime-benchmarks",
     "teerex-primitives",
     "test-utils",
-    "frame-benchmarking/runtime-benchmarks",
     "frame-system/runtime-benchmarks",
     "frame-support/runtime-benchmarks",
 ]
diff --git a/runtime/litentry/Cargo.toml b/runtime/litentry/Cargo.toml
index 0c2e7b99c0..409c310c13 100644
--- a/runtime/litentry/Cargo.toml
+++ b/runtime/litentry/Cargo.toml
@@ -9,8 +9,6 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = '0.4.1' }
 log = { version = "0.4", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", optional = true, features = ["derive"] }
-smallvec = "1.9.0"
 
 core-primitives = { path = "../../primitives/core", default-features = false }
 
@@ -144,7 +142,6 @@ runtime-benchmarks = [
 std = [
     "codec/std",
     "log/std",
-    "serde",
     "sp-api/std",
     "sp-block-builder/std",
     "sp-consensus-aura/std",
diff --git a/runtime/litmus/Cargo.toml b/runtime/litmus/Cargo.toml
index aa5b360fa0..476e9442e3 100644
--- a/runtime/litmus/Cargo.toml
+++ b/runtime/litmus/Cargo.toml
@@ -9,8 +9,6 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = '0.4.1' }
 log = { version = "0.4", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", optional = true, features = ["derive"] }
-smallvec = "1.9.0"
 
 core-primitives = { path = "../../primitives/core", default-features = false }
 
@@ -158,7 +156,6 @@ std = [
     "codec/std",
     "log/std",
     "scale-info/std",
-    "serde",
     "sp-api/std",
     "sp-block-builder/std",
     "sp-consensus-aura/std",
diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml
index d8efb2b2ba..bcc65b3d06 100644
--- a/runtime/rococo/Cargo.toml
+++ b/runtime/rococo/Cargo.toml
@@ -9,8 +9,6 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = '0.4.1' }
 log = { version = "0.4", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", optional = true, features = ["derive"] }
-smallvec = "1.9.0"
 
 core-primitives = { path = "../../primitives/core", default-features = false }
 
@@ -176,7 +174,6 @@ std = [
     "codec/std",
     "log/std",
     "scale-info/std",
-    "serde",
     "sp-api/std",
     "sp-block-builder/std",
     "sp-consensus-aura/std",
diff --git a/tee-worker/Cargo.lock b/tee-worker/Cargo.lock
index 88f8e1201c..42209161ac 100644
--- a/tee-worker/Cargo.lock
+++ b/tee-worker/Cargo.lock
@@ -812,16 +812,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
-dependencies = [
- "arrayref",
- "byte-tools 0.2.0",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -829,7 +819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
  "block-padding 0.1.5",
- "byte-tools 0.3.1",
+ "byte-tools",
  "byteorder 1.4.3",
  "generic-array 0.12.4",
 ]
@@ -868,7 +858,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 dependencies = [
- "byte-tools 0.3.1",
+ "byte-tools",
 ]
 
 [[package]]
@@ -935,12 +925,6 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
-[[package]]
-name = "byte-tools"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
-
 [[package]]
 name = "byte-tools"
 version = "0.3.1"
@@ -1451,7 +1435,6 @@ dependencies = [
  "sp-std 5.0.0",
  "strum 0.25.0",
  "strum_macros 0.25.2",
- "xcm",
 ]
 
 [[package]]
@@ -2215,7 +2198,7 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.0",
+ "rustc_version",
  "syn 1.0.109",
 ]
 
@@ -2225,15 +2208,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
-[[package]]
-name = "digest"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
-dependencies = [
- "generic-array 0.9.1",
-]
-
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -3628,15 +3602,6 @@ dependencies = [
  "byteorder 1.4.3",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d00328cedcac5e81c683e5620ca6a30756fc23027ebf9bff405c0e8da1fbb7e"
-dependencies = [
- "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.12.4"
@@ -4492,7 +4457,6 @@ dependencies = [
  "log 0.4.19",
  "parity-scale-codec",
  "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
  "substrate-fixed 0.5.9 (git+https://github.com/encointer/substrate-fixed?tag=v0.5.9)",
  "thiserror 1.0.44",
@@ -4505,39 +4469,24 @@ dependencies = [
 name = "ita-sgx-runtime"
 version = "0.9.0"
 dependencies = [
- "frame-benchmarking",
  "frame-executive",
  "frame-support",
  "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
  "hex-literal 0.3.4",
  "itp-sgx-runtime-primitives",
- "litentry-primitives",
- "pallet-aura",
  "pallet-balances",
  "pallet-evm 6.0.0-dev (git+https://github.com/integritee-network/frontier.git?branch=polkadot-v0.9.39)",
- "pallet-grandpa",
  "pallet-identity-management-tee",
- "pallet-insecure-randomness-collective-flip",
  "pallet-parentchain",
  "pallet-sudo",
  "pallet-timestamp",
  "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "scale-info",
- "serde 1.0.175",
  "sp-api",
- "sp-block-builder",
- "sp-consensus-aura",
  "sp-core",
- "sp-inherents",
- "sp-offchain",
  "sp-runtime",
- "sp-session",
  "sp-std 5.0.0",
- "sp-transaction-pool",
  "sp-version",
 ]
 
@@ -4559,7 +4508,6 @@ dependencies = [
  "itp-storage",
  "itp-types",
  "itp-utils",
- "lc-scheduled-enclave",
  "lc-stf-task-sender",
  "litentry-primitives",
  "log 0.4.19",
@@ -4567,11 +4515,9 @@ dependencies = [
  "pallet-parentchain",
  "pallet-sudo",
  "parity-scale-codec",
- "ring 0.16.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp",
  "sgx_tstd",
  "sha3",
- "sp-application-crypto",
  "sp-core",
  "sp-io 7.0.0",
  "sp-keyring",
@@ -4592,7 +4538,6 @@ dependencies = [
  "parity-scale-codec",
  "serde_json 1.0.103",
  "sgx_tstd",
- "sgx_types",
  "sp-runtime",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
@@ -4613,13 +4558,10 @@ dependencies = [
  "itp-test",
  "itp-top-pool-author",
  "itp-types",
- "litentry-primitives",
  "log 0.4.19",
  "parity-scale-codec",
  "sgx_tstd",
- "sgx_types",
  "sp-core",
- "sp-io 7.0.0",
  "sp-runtime",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
@@ -4644,11 +4586,9 @@ version = "0.9.0"
 dependencies = [
  "itc-parentchain-block-importer",
  "itp-import-queue",
- "itp-types",
  "log 0.4.19",
  "sgx_tstd",
  "sgx_types",
- "sp-runtime",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
 ]
@@ -4661,7 +4601,6 @@ dependencies = [
  "itc-parentchain-indirect-calls-executor",
  "itc-parentchain-light-client",
  "itp-extrinsics-factory",
- "itp-settings",
  "itp-stf-executor",
  "itp-types",
  "log 0.4.19",
@@ -4683,14 +4622,10 @@ dependencies = [
  "env_logger 0.9.3",
  "futures 0.3.28",
  "futures 0.3.8",
- "hex 0.4.3",
- "ita-sgx-runtime",
  "ita-stf",
  "itc-parentchain-test",
  "itp-api-client-types",
- "itp-component-container",
  "itp-node-api",
- "itp-ocall-api",
  "itp-sgx-crypto",
  "itp-stf-executor",
  "itp-stf-primitives",
@@ -4701,8 +4636,6 @@ dependencies = [
  "lc-scheduled-enclave",
  "litentry-primitives",
  "log 0.4.19",
- "pallet-identity-management",
- "pallet-vc-management",
  "parity-scale-codec",
  "sgx_tstd",
  "sgx_types",
@@ -4718,10 +4651,7 @@ dependencies = [
 name = "itc-parentchain-light-client"
 version = "0.9.0"
 dependencies = [
- "derive_more",
  "finality-grandpa",
- "frame-system",
- "hash-db",
  "itc-parentchain-test",
  "itp-ocall-api",
  "itp-sgx-io",
@@ -4729,17 +4659,12 @@ dependencies = [
  "itp-storage",
  "itp-test",
  "itp-types",
- "lazy_static",
  "log 0.4.19",
- "num-traits 0.2.16",
  "parity-scale-codec",
  "sgx_tstd",
  "sgx_types",
- "sp-application-crypto",
- "sp-core",
  "sp-finality-grandpa",
  "sp-runtime",
- "sp-trie",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
 ]
@@ -4748,17 +4673,8 @@ dependencies = [
 name = "itc-parentchain-test"
 version = "0.9.0"
 dependencies = [
- "frame-support",
- "frame-system",
  "itp-types",
- "log 0.4.19",
- "parity-scale-codec",
- "scale-info",
- "serde 1.0.175",
- "sp-core",
- "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
  "sp-runtime",
- "sp-std 5.0.0",
 ]
 
 [[package]]
@@ -4774,7 +4690,6 @@ dependencies = [
  "serde 1.0.175",
  "serde_json 1.0.103",
  "sgx_tstd",
- "sgx_types",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
  "url 2.1.1",
@@ -4801,7 +4716,6 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "rustls 0.19.1",
- "serde_derive 1.0.175",
  "serde_json 1.0.103",
  "sgx_crypto_helper",
  "teerex-primitives",
@@ -4827,7 +4741,6 @@ dependencies = [
  "jsonrpsee 0.2.0",
  "log 0.4.19",
  "parity-scale-codec",
- "serde_json 1.0.103",
  "sp-core",
  "tokio",
 ]
@@ -4846,9 +4759,7 @@ dependencies = [
  "rcgen 0.9.2",
  "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx)",
  "rustls 0.19.1",
- "sgx_crypto_helper",
  "sgx_tstd",
- "sgx_types",
  "sp-core",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
@@ -4900,12 +4811,10 @@ dependencies = [
  "hex 0.4.3",
  "itp-api-client-types",
  "itp-types",
- "parity-scale-codec",
  "sp-core",
  "sp-finality-grandpa",
  "sp-runtime",
  "substrate-api-client",
- "thiserror 1.0.44",
 ]
 
 [[package]]
@@ -4937,7 +4846,6 @@ dependencies = [
  "itp-sgx-crypto",
  "itp-sgx-io",
  "itp-time-utils",
- "itp-types",
  "log 0.4.19",
  "num-bigint 0.2.5",
  "parity-scale-codec",
@@ -4951,7 +4859,6 @@ dependencies = [
  "sgx_tstd",
  "sgx_types",
  "sp-core",
- "sp-runtime",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
  "webpki 0.21.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4981,7 +4888,6 @@ dependencies = [
  "itp-storage",
  "itp-types",
  "lc-data-providers",
- "litentry-primitives",
  "log 0.4.19",
  "parity-scale-codec",
  "serde_json 1.0.103",
@@ -4989,7 +4895,6 @@ dependencies = [
  "sgx_types",
  "sgx_urts",
  "sp-core",
- "sp-finality-grandpa",
  "sp-runtime",
  "teerex-primitives",
  "thiserror 1.0.44",
@@ -5159,14 +5064,12 @@ version = "0.9.0"
 dependencies = [
  "aes 0.6.0",
  "derive_more",
- "itp-settings",
  "itp-sgx-io",
  "itp-sgx-temp-dir",
  "log 0.4.19",
  "ofb",
  "parity-scale-codec",
  "serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx?tag=sgx_1.1.3)",
- "serde 1.0.175",
  "serde_json 1.0.103",
  "serde_json 1.0.60 (git+https://github.com/mesalock-linux/serde-json-sgx?tag=sgx_1.1.3)",
  "sgx_crypto_helper",
@@ -5233,7 +5136,6 @@ dependencies = [
  "itp-stf-primitives",
  "itp-stf-state-handler",
  "itp-stf-state-observer",
- "itp-storage",
  "itp-test",
  "itp-time-utils",
  "itp-top-pool-author",
@@ -5241,7 +5143,6 @@ dependencies = [
  "litentry-primitives",
  "log 0.4.19",
  "parity-scale-codec",
- "sgx_crypto_helper",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
@@ -5285,12 +5186,10 @@ dependencies = [
  "itp-stf-state-observer",
  "itp-time-utils",
  "itp-types",
- "lazy_static",
  "log 0.4.19",
  "parity-scale-codec",
  "rust-base58 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-base58 0.0.4 (git+https://github.com/mesalock-linux/rust-base58-sgx?rev=sgx_1.1.3)",
- "sgx_tcrypto",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
@@ -5304,7 +5203,6 @@ version = "0.9.0"
 dependencies = [
  "itp-types",
  "log 0.4.19",
- "parity-scale-codec",
  "sgx_tstd",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
@@ -5342,7 +5240,6 @@ dependencies = [
 name = "itp-test"
 version = "0.9.0"
 dependencies = [
- "derive_more",
  "hex 0.4.3",
  "ita-stf",
  "itp-ocall-api",
@@ -5394,11 +5291,9 @@ dependencies = [
  "parity-util-mem",
  "serde 1.0.175",
  "sgx_tstd",
- "sgx_types",
  "sp-application-crypto",
  "sp-core",
  "sp-runtime",
- "thiserror 1.0.44",
  "thiserror 1.0.9",
 ]
 
@@ -5417,7 +5312,6 @@ dependencies = [
  "itp-test",
  "itp-top-pool",
  "itp-types",
- "itp-utils",
  "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 18.0.0 (git+https://github.com/scs/jsonrpc?branch=no_std_v18)",
  "litentry-primitives",
@@ -5425,11 +5319,9 @@ dependencies = [
  "parity-scale-codec",
  "sgx_crypto_helper",
  "sgx_tstd",
- "sgx_types",
  "sp-core",
  "sp-keyring",
  "sp-runtime",
- "thiserror 1.0.44",
  "thiserror 1.0.9",
 ]
 
@@ -5437,15 +5329,11 @@ dependencies = [
 name = "itp-types"
 version = "0.9.0"
 dependencies = [
- "chrono 0.4.26",
  "frame-system",
  "itp-sgx-runtime-primitives",
  "litentry-primitives",
  "pallet-balances",
  "parity-scale-codec",
- "primitive-types",
- "serde 1.0.175",
- "serde_json 1.0.103",
  "sp-core",
  "sp-runtime",
  "sp-std 5.0.0",
@@ -5474,7 +5362,6 @@ dependencies = [
  "itp-sgx-crypto",
  "itp-sgx-externalities",
  "itp-stf-executor",
- "itp-stf-interface",
  "itp-time-utils",
  "itp-top-pool-author",
  "itp-types",
@@ -5516,7 +5403,6 @@ version = "0.9.0"
 dependencies = [
  "env_logger 0.9.3",
  "finality-grandpa",
- "frame-support",
  "ita-stf",
  "itc-parentchain-block-import-dispatcher",
  "itc-parentchain-test",
@@ -5532,7 +5418,6 @@ dependencies = [
  "itp-time-utils",
  "itp-top-pool-author",
  "itp-types",
- "itp-utils",
  "its-block-composer",
  "its-block-verification",
  "its-consensus-common",
@@ -5586,13 +5471,11 @@ name = "its-consensus-slots"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "futures 0.3.28",
  "futures-timer",
  "hex 0.4.3",
  "itc-parentchain-test",
  "itp-settings",
  "itp-sgx-externalities",
- "itp-sgx-io",
  "itp-stf-state-handler",
  "itp-test",
  "itp-time-utils",
@@ -5642,7 +5525,6 @@ dependencies = [
  "scale-info",
  "serde 1.0.175",
  "sp-core",
- "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
  "sp-runtime",
  "sp-std 5.0.0",
 ]
@@ -5664,7 +5546,6 @@ dependencies = [
  "rust-base58 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-base58 0.0.4 (git+https://github.com/mesalock-linux/rust-base58-sgx?rev=sgx_1.1.3)",
  "sgx_tstd",
- "sgx_types",
  "sp-core",
 ]
 
@@ -5692,12 +5573,10 @@ dependencies = [
  "its-primitives",
  "log 0.4.19",
  "parity-scale-codec",
- "serde 1.0.175",
  "sgx_tstd",
  "sp-core",
  "sp-io 7.0.0",
  "sp-runtime",
- "sp-std 5.0.0",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
 ]
@@ -5728,7 +5607,6 @@ version = "0.9.0"
 dependencies = [
  "itp-types",
  "its-primitives",
- "parity-scale-codec",
  "sgx_tstd",
  "sp-core",
 ]
@@ -5741,7 +5619,6 @@ dependencies = [
  "frame-support",
  "itc-parentchain-test",
  "itp-ocall-api",
- "itp-storage",
  "itp-teerex-storage",
  "itp-test",
  "itp-types",
@@ -5749,7 +5626,6 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-std 5.0.0",
- "thiserror 1.0.44",
 ]
 
 [[package]]
@@ -6132,23 +6008,15 @@ version = "0.1.0"
 dependencies = [
  "blake2-rfc",
  "frame-support",
- "futures 0.3.28",
- "futures 0.3.8",
  "hex 0.4.0",
  "hex 0.4.3",
  "http 0.2.1",
  "http 0.2.9",
  "http_req 0.8.1 (git+https://github.com/integritee-network/http_req?branch=master)",
  "http_req 0.8.1 (git+https://github.com/integritee-network/http_req)",
- "ita-stf",
  "itc-rest-client",
  "itp-ocall-api",
- "itp-sgx-crypto",
- "itp-sgx-externalities",
- "itp-stf-executor",
  "itp-stf-primitives",
- "itp-storage",
- "itp-top-pool-author",
  "itp-types",
  "itp-utils",
  "lc-credentials",
@@ -6162,15 +6030,9 @@ dependencies = [
  "serde 1.0.175",
  "serde_json 1.0.103",
  "sgx_tstd",
- "sp-core",
- "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
- "sp-runtime",
- "sp-std 5.0.0",
  "ss58-registry",
- "thiserror 1.0.44",
  "thiserror 1.0.9",
  "url 2.1.1",
- "url 2.4.0",
 ]
 
 [[package]]
@@ -6179,22 +6041,12 @@ version = "0.1.0"
 dependencies = [
  "chrono 0.4.11",
  "chrono 0.4.26",
- "futures 0.3.28",
- "futures 0.3.8",
  "hex 0.4.0",
  "hex 0.4.3",
- "http 0.2.1",
- "http 0.2.9",
- "http_req 0.8.1 (git+https://github.com/integritee-network/http_req?branch=master)",
- "http_req 0.8.1 (git+https://github.com/integritee-network/http_req)",
- "itp-ocall-api",
- "itp-sgx-crypto",
- "itp-sgx-externalities",
  "itp-stf-primitives",
  "itp-time-utils",
  "itp-types",
  "itp-utils",
- "lc-data-providers",
  "litentry-primitives",
  "log 0.4.19",
  "parity-scale-codec",
@@ -6208,12 +6060,8 @@ dependencies = [
  "serde_json 1.0.60 (git+https://github.com/mesalock-linux/serde-json-sgx?tag=sgx_1.1.3)",
  "sgx_tstd",
  "sp-core",
- "sp-runtime",
- "sp-std 5.0.0",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
- "url 2.1.1",
- "url 2.4.0",
 ]
 
 [[package]]
@@ -6222,7 +6070,6 @@ version = "0.1.0"
 dependencies = [
  "env_logger 0.10.0",
  "hex 0.4.0",
- "hex 0.4.3",
  "http 0.2.1",
  "http 0.2.9",
  "http_req 0.8.1 (git+https://github.com/integritee-network/http_req?branch=master)",
@@ -6248,38 +6095,19 @@ name = "lc-identity-verification"
 version = "0.1.0"
 dependencies = [
  "frame-support",
- "futures 0.3.28",
  "futures 0.3.8",
  "hex 0.4.0",
  "hex 0.4.3",
  "http 0.2.1",
- "http 0.2.9",
- "http_req 0.8.1 (git+https://github.com/integritee-network/http_req?branch=master)",
  "http_req 0.8.1 (git+https://github.com/integritee-network/http_req)",
- "ita-stf",
- "itc-rest-client",
- "itp-ocall-api",
  "itp-sgx-crypto",
- "itp-sgx-externalities",
- "itp-storage",
- "itp-types",
- "itp-utils",
- "lazy_static",
  "lc-data-providers",
  "lc-stf-task-sender",
  "litentry-primitives",
  "log 0.4.19",
- "parity-scale-codec",
- "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
- "sp-core",
- "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
- "sp-std 5.0.0",
- "thiserror 1.0.44",
  "thiserror 1.0.9",
  "url 2.1.1",
- "url 2.4.0",
 ]
 
 [[package]]
@@ -6288,11 +6116,9 @@ version = "0.1.0"
 dependencies = [
  "hex 0.4.3",
  "ita-stf",
- "lazy_static",
  "lc-data-providers",
  "litentry-primitives",
  "log 0.4.19",
- "parity-scale-codec",
  "serde_json 1.0.103",
  "sp-core",
  "tokio",
@@ -6303,16 +6129,13 @@ dependencies = [
 name = "lc-scheduled-enclave"
 version = "0.8.0"
 dependencies = [
- "itp-component-container",
  "itp-settings",
  "itp-sgx-io",
  "itp-types",
  "lazy_static",
- "litentry-primitives",
  "log 0.4.19",
  "parity-scale-codec",
  "sgx_tstd",
- "sgx_types",
  "sp-std 5.0.0",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
@@ -6326,28 +6149,16 @@ dependencies = [
  "futures 0.3.28",
  "futures 0.3.8",
  "hex 0.4.0",
- "hex 0.4.3",
- "http 0.2.1",
- "http 0.2.9",
- "http_req 0.8.1 (git+https://github.com/integritee-network/http_req?branch=master)",
- "http_req 0.8.1 (git+https://github.com/integritee-network/http_req)",
  "ita-sgx-runtime",
  "ita-stf",
- "itc-rest-client",
  "itp-enclave-metrics",
- "itp-extrinsics-factory",
- "itp-node-api",
  "itp-ocall-api",
  "itp-sgx-crypto",
  "itp-sgx-externalities",
  "itp-stf-executor",
  "itp-stf-state-handler",
- "itp-stf-state-observer",
- "itp-storage",
  "itp-top-pool-author",
  "itp-types",
- "itp-utils",
- "lazy_static",
  "lc-assertion-build",
  "lc-credentials",
  "lc-data-providers",
@@ -6356,39 +6167,25 @@ dependencies = [
  "litentry-primitives",
  "log 0.4.19",
  "parity-scale-codec",
- "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
  "sp-core",
- "sp-std 5.0.0",
  "thiserror 1.0.44",
  "thiserror 1.0.9",
  "threadpool 1.8.0",
  "threadpool 1.8.1",
  "url 2.1.1",
- "url 2.4.0",
 ]
 
 [[package]]
 name = "lc-stf-task-sender"
 version = "0.1.0"
 dependencies = [
- "http 0.2.1",
- "http 0.2.9",
- "http_req 0.8.1 (git+https://github.com/integritee-network/http_req?branch=master)",
- "http_req 0.8.1 (git+https://github.com/integritee-network/http_req)",
- "itc-rest-client",
- "itp-ocall-api",
- "itp-sgx-crypto",
  "itp-stf-primitives",
  "itp-types",
- "itp-utils",
  "lazy_static",
  "litentry-primitives",
  "log 0.4.19",
  "parity-scale-codec",
- "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
  "sp-runtime",
  "sp-std 5.0.0",
@@ -7018,19 +6815,16 @@ version = "0.9.0"
 dependencies = [
  "array-bytes 6.1.0",
  "base58",
- "blake2-rfc",
  "chrono 0.4.26",
  "clap 3.2.25",
  "env_logger 0.9.3",
  "frame-metadata 15.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "frame-system",
  "hdrhistogram",
  "hex 0.4.3",
  "ita-sgx-runtime",
  "ita-stf",
  "itc-rpc-client",
  "itp-node-api",
- "itp-node-api-metadata",
  "itp-rpc",
  "itp-sgx-crypto",
  "itp-stf-primitives",
@@ -7043,13 +6837,10 @@ dependencies = [
  "pallet-evm 6.0.0-dev (git+https://github.com/integritee-network/frontier.git?branch=polkadot-v0.9.39)",
  "pallet-teerex",
  "parity-scale-codec",
- "primitive-types",
  "rand 0.8.5",
  "rayon",
  "rococo-parachain-runtime",
- "sc-keystore",
  "scale-value",
- "serde 1.0.175",
  "serde_json 1.0.103",
  "sgx_crypto_helper",
  "sp-application-crypto",
@@ -7061,7 +6852,6 @@ dependencies = [
  "substrate-client-keystore",
  "teerex-primitives",
  "thiserror 1.0.44",
- "ws",
 ]
 
 [[package]]
@@ -7076,10 +6866,6 @@ dependencies = [
 name = "litentry-primitives"
 version = "0.1.0"
 dependencies = [
- "base64 0.13.0 (git+https://github.com/mesalock-linux/rust-base64-sgx?rev=sgx_1.1.3)",
- "base64 0.13.1",
- "chrono 0.4.11",
- "chrono 0.4.26",
  "core-primitives",
  "hex 0.4.3",
  "itp-utils",
@@ -7091,7 +6877,6 @@ dependencies = [
  "ring 0.16.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "scale-info",
  "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
  "sp-core",
  "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
@@ -7113,7 +6898,6 @@ dependencies = [
  "dirs",
  "env_logger 0.9.3",
  "frame-support",
- "frame-system",
  "futures 0.3.28",
  "hex 0.4.3",
  "ipfs-api",
@@ -7123,12 +6907,9 @@ dependencies = [
  "itc-rest-client",
  "itc-rpc-client",
  "itc-rpc-server",
- "itp-api-client-types",
  "itp-enclave-api",
  "itp-enclave-metrics",
  "itp-node-api",
- "itp-node-api-metadata",
- "itp-rpc",
  "itp-settings",
  "itp-stf-primitives",
  "itp-storage",
@@ -7163,7 +6944,6 @@ dependencies = [
  "sgx_crypto_helper",
  "sgx_types",
  "sgx_urts",
- "sha2 0.7.1",
  "sp-core",
  "sp-finality-grandpa",
  "sp-keyring",
@@ -8551,13 +8331,9 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal 0.3.4",
- "log 0.4.19",
  "orml-traits",
  "parity-scale-codec",
  "scale-info",
- "serde 1.0.175",
- "smallvec 1.11.0",
  "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
  "sp-runtime",
  "sp-std 5.0.0",
@@ -8769,7 +8545,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex 0.4.3",
  "pallet-bridge",
  "pallet-parachain-staking",
  "parity-scale-codec",
@@ -9032,7 +8807,6 @@ dependencies = [
 name = "pallet-evm-address"
 version = "0.1.0"
 dependencies = [
- "frame-benchmarking",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
@@ -9135,12 +8909,9 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex 0.4.3",
- "log 0.4.19",
  "pallet-teerex",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic",
  "sp-core",
  "sp-runtime",
  "sp-std 5.0.0",
@@ -9151,7 +8922,6 @@ dependencies = [
 name = "pallet-identity-management-tee"
 version = "0.1.0"
 dependencies = [
- "frame-benchmarking",
  "frame-support",
  "frame-system",
  "hex 0.4.3",
@@ -9160,9 +8930,6 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "serde 1.0.175",
- "serde_derive 1.0.175",
- "serde_json 1.0.103",
  "sp-core",
  "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
  "sp-runtime",
@@ -9206,20 +8973,6 @@ dependencies = [
  "sp-std 5.0.0",
 ]
 
-[[package]]
-name = "pallet-insecure-randomness-collective-flip"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "safe-mix",
- "scale-info",
- "sp-runtime",
- "sp-std 5.0.0",
-]
-
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
@@ -9342,14 +9095,11 @@ version = "0.9.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "log 0.4.19",
  "parity-scale-codec",
  "scale-info",
- "serde 1.0.175",
  "sp-core",
  "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
  "sp-runtime",
- "sp-std 5.0.0",
 ]
 
 [[package]]
@@ -9535,7 +9285,6 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "serde 1.0.175",
  "sgx-verify",
  "sp-core",
  "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
@@ -9666,11 +9415,8 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex 0.4.3",
- "log 0.4.19",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic",
  "sp-core",
  "sp-runtime",
  "sp-std 5.0.0",
@@ -12118,8 +11864,6 @@ dependencies = [
  "polkadot-parachain",
  "runtime-common",
  "scale-info",
- "serde 1.0.175",
- "smallvec 1.11.0",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
@@ -12218,7 +11962,6 @@ dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
- "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log 0.4.19",
@@ -12234,7 +11977,6 @@ dependencies = [
  "pallet-membership",
  "pallet-multisig",
  "pallet-teerex",
- "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-vesting",
@@ -12311,15 +12053,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -12505,15 +12238,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "077d73db7973cccf63eb4aff1e5a34dc2459baa867512088269ea5f2f4253c90"
 
-[[package]]
-name = "safe-mix"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c"
-dependencies = [
- "rustc_version 0.2.3",
-]
-
 [[package]]
 name = "safe_arch"
 version = "0.7.1"
@@ -13811,15 +13535,6 @@ dependencies = [
  "semver-parser",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.18"
@@ -13972,7 +13687,6 @@ dependencies = [
  "serde 1.0.175",
  "serde_json 1.0.103",
  "sp-core",
- "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
  "sp-std 5.0.0",
  "teerex-primitives",
  "webpki 0.21.0",
@@ -14168,18 +13882,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0"
-dependencies = [
- "block-buffer 0.3.3",
- "byte-tools 0.2.0",
- "digest 0.7.6",
- "fake-simd",
-]
-
 [[package]]
 name = "sha2"
 version = "0.8.2"
@@ -14249,9 +13951,6 @@ dependencies = [
  "scale-info",
  "serde 1.0.175",
  "sp-core",
- "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
- "sp-runtime",
- "sp-std 5.0.0",
 ]
 
 [[package]]
@@ -14368,7 +14067,7 @@ dependencies = [
  "curve25519-dalek 4.0.0-rc.1",
  "rand_core 0.6.4",
  "ring 0.16.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.4.0",
+ "rustc_version",
  "sha2 0.10.7",
  "subtle",
 ]
@@ -14778,23 +14477,12 @@ dependencies = [
 name = "sp-io"
 version = "7.0.0"
 dependencies = [
- "environmental 1.1.3",
- "futures 0.3.28",
- "hash-db",
  "itp-sgx-externalities",
  "libsecp256k1",
  "log 0.4.19",
  "parity-scale-codec",
- "parking_lot 0.12.1",
  "sgx_tstd",
- "sgx_types",
  "sp-core",
- "sp-runtime-interface",
- "sp-std 5.0.0",
- "sp-tracing",
- "sp-wasm-interface",
- "tracing",
- "tracing-core",
 ]
 
 [[package]]
@@ -15576,7 +15264,6 @@ name = "teeracle-primitives"
 version = "0.1.0"
 dependencies = [
  "common-primitives",
- "sp-std 5.0.0",
  "substrate-fixed 0.5.9 (git+https://github.com/encointer/substrate-fixed?tag=v0.5.9)",
 ]
 
@@ -15584,12 +15271,9 @@ dependencies = [
 name = "teerex-primitives"
 version = "0.1.0"
 dependencies = [
- "common-primitives",
  "parity-scale-codec",
  "scale-info",
- "serde 1.0.175",
  "sp-core",
- "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39)",
  "sp-std 5.0.0",
 ]
 
diff --git a/tee-worker/app-libs/oracle/Cargo.toml b/tee-worker/app-libs/oracle/Cargo.toml
index 7d8f0b39ea..eb8fa135e2 100644
--- a/tee-worker/app-libs/oracle/Cargo.toml
+++ b/tee-worker/app-libs/oracle/Cargo.toml
@@ -20,7 +20,6 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 lazy_static = { version = "1.1.0", features = ["spin_no_std"] }
 log = { version = "0.4", default-features = false }
 serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed", tag = "v0.5.9" }
 
 # internal dependencies
@@ -36,7 +35,6 @@ std = [
     "itp-ocall-api/std",
     "log/std",
     "serde/std",
-    "serde_json/std",
     "substrate-fixed/std",
     "thiserror",
     "url",
diff --git a/tee-worker/app-libs/sgx-runtime/Cargo.toml b/tee-worker/app-libs/sgx-runtime/Cargo.toml
index b605d73c6c..b3afcc2474 100644
--- a/tee-worker/app-libs/sgx-runtime/Cargo.toml
+++ b/tee-worker/app-libs/sgx-runtime/Cargo.toml
@@ -9,7 +9,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 hex-literal = { version = "0.3.4", optional = true }
-serde = { version = "1.0", optional = true, features = ["derive"] }
 # alias "parity-scale-code" to "codec"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
@@ -18,37 +17,23 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive"
 itp-sgx-runtime-primitives = { path = "../../core-primitives/sgx-runtime-primitives", default-features = false }
 
 # Substrate dependencies
-frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-grandpa = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-insecure-randomness-collective-flip = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-version = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # Integritee dependencies
 pallet-evm = { default-features = false, optional = true, git = "https://github.com/integritee-network/frontier.git", branch = "polkadot-v0.9.39" }
 
 # Litentry
-litentry-primitives = { path = "../../litentry/primitives", default-features = false }
 pallet-imt = { package = "pallet-identity-management-tee", path = "../../litentry/pallets/identity-management", default-features = false }
 pallet-parentchain = { path = "../../../pallets/parentchain", default-features = false }
 
@@ -64,9 +49,7 @@ evm_std = [
 ]
 runtime-benchmarks = [
     "hex-literal",
-    "frame-benchmarking",
     "frame-support/runtime-benchmarks",
-    "frame-system-benchmarking",
     "frame-system/runtime-benchmarks",
     "pallet-balances/runtime-benchmarks",
     "pallet-timestamp/runtime-benchmarks",
@@ -75,7 +58,6 @@ runtime-benchmarks = [
 std = [
     "codec/std",
     "scale-info/std",
-    "serde",
     "itp-sgx-runtime-primitives/std",
     "frame-executive/std",
     "frame-support/std",
@@ -87,12 +69,9 @@ std = [
     "pallet-parentchain/std",
     "sp-api/std",
     "sp-core/std",
-    "sp-inherents/std",
     "sp-runtime/std",
     "sp-std/std",
     "sp-version/std",
     # litentry
-    "sp-consensus-aura/std",
     "pallet-imt/std",
-    "pallet-grandpa/std",
 ]
diff --git a/tee-worker/app-libs/stf/Cargo.toml b/tee-worker/app-libs/stf/Cargo.toml
index e2df83738d..0ad2839d75 100644
--- a/tee-worker/app-libs/stf/Cargo.toml
+++ b/tee-worker/app-libs/stf/Cargo.toml
@@ -34,16 +34,13 @@ frame-support = { default-features = false, git = "https://github.com/paritytech
 frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-application-crypto = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # litentry
-lc-scheduled-enclave = { path = "../../litentry/core/scheduled-enclave", default-features = false }
 lc-stf-task-sender = { path = "../../litentry/core/stf-task/sender", default-features = false }
 litentry-primitives = { path = "../../litentry/primitives", default-features = false }
 pallet-parentchain = { path = "../../../pallets/parentchain", default-features = false }
-ring = { version = "0.16.20", default-features = false }
 
 [dev-dependencies]
 sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
@@ -61,14 +58,12 @@ sgx = [
     "itp-node-api-metadata-provider/sgx",
     # litentry
     "litentry-primitives/sgx",
-    "lc-scheduled-enclave/sgx",
     "lc-stf-task-sender/sgx",
 ]
 std = [
     # crates.io
     "codec/std",
     "log/std",
-    "rlp/std",
     # local
     "ita-sgx-runtime/std",
     "itp-hashing/std",
@@ -86,7 +81,6 @@ std = [
     "pallet-sudo/std",
     "frame-system/std",
     "frame-support/std",
-    "sp-application-crypto/std",
     "sp-runtime/std",
     "pallet-parentchain/std",
     "sp-io/std",
@@ -96,7 +90,6 @@ std = [
     "ita-sgx-runtime/std",
     "itp-node-api/std",
     "litentry-primitives/std",
-    "lc-scheduled-enclave/std",
     "lc-stf-task-sender/std",
 ]
 test = []
diff --git a/tee-worker/cli/Cargo.toml b/tee-worker/cli/Cargo.toml
index afe468f444..da5b7d86cd 100644
--- a/tee-worker/cli/Cargo.toml
+++ b/tee-worker/cli/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 [dependencies]
 array-bytes = { version = "6.0.0" }
 base58 = "0.2"
-blake2-rfc = { version = "0.2.18" }
 chrono = "*"
 clap = { version = "3.1.6", features = ["derive"] }
 codec = { version = "3.0.0", package = "parity-scale-codec", features = ["derive"] }
@@ -15,14 +14,11 @@ env_logger = "0.9"
 hdrhistogram = "7.5.0"
 hex = "0.4.2"
 log = "0.4"
-primitive-types = { version = "0.12.1", features = ["codec"] }
 rand = "0.8.5"
 rayon = "1.5.1"
-serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sgx_crypto_helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 thiserror = "1.0"
-ws = { version = "0.9.1", features = ["ssl"] }
 
 # scs / integritee
 pallet-evm = { optional = true, git = "https://github.com/integritee-network/frontier.git", branch = "polkadot-v0.9.39" }
@@ -31,9 +27,7 @@ substrate-api-client = { default-features = false, features = ["std", "ws-client
 substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.39" }
 
 # substrate dependencies
-frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
@@ -53,7 +47,6 @@ itp-utils = { path = "../core-primitives/utils" }
 # litentry
 frame-metadata = "15.0.0"
 ita-sgx-runtime = { path = "../app-libs/sgx-runtime" }
-itp-node-api-metadata = { path = "../core-primitives/node-api/metadata" }
 litentry-primitives = { path = "../litentry/primitives" }
 my-node-runtime = { package = "rococo-parachain-runtime", path = "../../runtime/rococo" }
 pallet-teerex = { path = "../../pallets/teerex", default-features = false }
diff --git a/tee-worker/core-primitives/attestation-handler/Cargo.toml b/tee-worker/core-primitives/attestation-handler/Cargo.toml
index 13605a9194..c1d516514a 100644
--- a/tee-worker/core-primitives/attestation-handler/Cargo.toml
+++ b/tee-worker/core-primitives/attestation-handler/Cargo.toml
@@ -45,14 +45,12 @@ itp-settings = { path = "../settings" }
 itp-sgx-crypto = { path = "../sgx/crypto", default-features = false }
 itp-sgx-io = { path = "../sgx/io", default-features = false }
 itp-time-utils = { path = "../time-utils", default-features = false }
-itp-types = { path = "../types", default-features = false }
 
 # integritee
 httparse = { default-features = false, git = "https://github.com/integritee-network/httparse-sgx", branch = "sgx-experimental" }
 
 # substrate deps
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 [features]
 default = ["std"]
@@ -74,10 +72,8 @@ std = [
     "itp-ocall-api/std",
     "itp-sgx-io/std",
     "itp-sgx-crypto/std",
-    "itp-types/std",
     # substrate
     "sp-core/std",
-    "sp-runtime/std",
     # integritee
     "httparse/std",
 ]
diff --git a/tee-worker/core-primitives/enclave-api/Cargo.toml b/tee-worker/core-primitives/enclave-api/Cargo.toml
index e779e0d148..24cb691a89 100644
--- a/tee-worker/core-primitives/enclave-api/Cargo.toml
+++ b/tee-worker/core-primitives/enclave-api/Cargo.toml
@@ -17,7 +17,6 @@ sgx_urts = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sd
 
 frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 itc-parentchain = { path = "../../core/parentchain/parentchain-crate" }
@@ -28,5 +27,4 @@ itp-types = { path = "../types" }
 
 # litentry
 lc-data-providers = { path = "../../litentry/core/data-providers" }
-litentry-primitives = { path = "../../litentry/primitives" }
 teerex-primitives = { path = "../../../primitives/teerex", default-features = false }
diff --git a/tee-worker/core-primitives/node-api/api-client-extensions/Cargo.toml b/tee-worker/core-primitives/node-api/api-client-extensions/Cargo.toml
index d0d71f6149..cbb9f1b6a3 100644
--- a/tee-worker/core-primitives/node-api/api-client-extensions/Cargo.toml
+++ b/tee-worker/core-primitives/node-api/api-client-extensions/Cargo.toml
@@ -5,9 +5,6 @@ authors = ['Trust Computing GmbH <info@litentry.com>', 'Integritee AG <hello@int
 edition = "2021"
 
 [dependencies]
-# crates.io
-codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
-thiserror = { version = "1.0" }
 
 # substrate
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
diff --git a/tee-worker/core-primitives/sgx/crypto/Cargo.toml b/tee-worker/core-primitives/sgx/crypto/Cargo.toml
index ad7a6e5cb7..5db331dfcf 100644
--- a/tee-worker/core-primitives/sgx/crypto/Cargo.toml
+++ b/tee-worker/core-primitives/sgx/crypto/Cargo.toml
@@ -11,7 +11,6 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 derive_more = { version = "0.99.5" }
 log = { version = "0.4", default-features = false }
 ofb = { version = "0.4.0" }
-serde = { version = "1.0", default-features = false, features = ["alloc"], optional = true }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true }
 
 # sgx deps
@@ -26,7 +25,6 @@ sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-s
 sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # local deps
-itp-settings = { path = "../../settings" }
 itp-sgx-io = { path = "../io", default-features = false }
 
 # test sgx deps
@@ -39,7 +37,6 @@ std = [
     "log/std",
     "itp-sgx-io/std",
     "sp-core/std",
-    "serde/std",
     "serde_json/std",
     "sgx-crypto-helper/default",
 ]
diff --git a/tee-worker/core-primitives/stf-executor/Cargo.toml b/tee-worker/core-primitives/stf-executor/Cargo.toml
index 2f2c4a8c31..52507a8850 100644
--- a/tee-worker/core-primitives/stf-executor/Cargo.toml
+++ b/tee-worker/core-primitives/stf-executor/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 
 [dependencies]
 # sgx dependencies
-sgx-crypto-helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", package = "sgx_crypto_helper", default-features = false, optional = true }
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["untrusted_time"] }
 sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
@@ -21,7 +20,6 @@ itp-stf-interface = { path = "../stf-interface", default-features = false }
 itp-stf-primitives = { path = "../stf-primitives", default-features = false }
 itp-stf-state-handler = { path = "../stf-state-handler", default-features = false }
 itp-stf-state-observer = { path = "../stf-state-observer", default-features = false }
-itp-storage = { path = "../storage", default-features = false }
 itp-time-utils = { path = "../time-utils", default-features = false }
 itp-top-pool-author = { path = "../top-pool-author", default-features = false }
 itp-types = { path = "../types", default-features = false }
@@ -64,7 +62,6 @@ std = [
     "itp-stf-state-handler/std",
     "itp-stf-state-observer/std",
     "itp-top-pool-author/std",
-    "itp-storage/std",
     "itp-types/std",
     "itp-time-utils/std",
     # crates.io
@@ -86,7 +83,6 @@ sgx = [
     "itp-stf-state-handler/sgx",
     "itp-stf-state-observer/sgx",
     "itp-top-pool-author/sgx",
-    "itp-storage/sgx",
     "itp-time-utils/sgx",
     "thiserror_sgx",
     # litentry
@@ -96,6 +92,5 @@ test = [
     "itc-parentchain-test",
     "itp-node-api/mocks",
     "itp-test",
-    "sgx-crypto-helper",
 ]
 mocks = []
diff --git a/tee-worker/core-primitives/stf-state-handler/Cargo.toml b/tee-worker/core-primitives/stf-state-handler/Cargo.toml
index e0428b2053..50c609708f 100644
--- a/tee-worker/core-primitives/stf-state-handler/Cargo.toml
+++ b/tee-worker/core-primitives/stf-state-handler/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 
 [dependencies]
 # sgx dependencies
-sgx_tcrypto = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
@@ -35,7 +34,6 @@ thiserror = { version = "1.0", optional = true }
 
 # no-std dependencies
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-lazy_static = { version = "1.1.0", features = ["spin_no_std"] }
 log = { version = "0.4", default-features = false }
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
@@ -61,7 +59,6 @@ std = [
 ]
 sgx = [
     "sgx_tstd",
-    "sgx_tcrypto",
     "rust-base58_sgx",
     "ita-stf/sgx",
     "itp-sgx-crypto/sgx",
diff --git a/tee-worker/core-primitives/stf-state-observer/Cargo.toml b/tee-worker/core-primitives/stf-state-observer/Cargo.toml
index f81ca95bf2..28a6cc80de 100644
--- a/tee-worker/core-primitives/stf-state-observer/Cargo.toml
+++ b/tee-worker/core-primitives/stf-state-observer/Cargo.toml
@@ -17,13 +17,11 @@ thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linu
 thiserror = { version = "1.0", optional = true }
 
 # no-std dependencies
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4", default-features = false }
 
 [features]
 default = ["std"]
 std = [
-    "codec/std",
     "itp-types/std",
     "log/std",
     "thiserror",
diff --git a/tee-worker/core-primitives/substrate-sgx/sp-io/Cargo.toml b/tee-worker/core-primitives/substrate-sgx/sp-io/Cargo.toml
index 540cf192a2..cf98dd51f9 100644
--- a/tee-worker/core-primitives/substrate-sgx/sp-io/Cargo.toml
+++ b/tee-worker/core-primitives/substrate-sgx/sp-io/Cargo.toml
@@ -7,27 +7,16 @@ license = "Apache-2.0"
 
 [dependencies]
 codec = { version = "3.0.0", package = "parity-scale-codec", default-features = false }
-futures = { version = "0.3.1", optional = true, features = ["thread-pool"] }
-hash-db = { version = "0.15.2", default-features = false }
 libsecp256k1 = { version = "0.7.0", default-features = false, features = ["static-context"] }
 log = { version = "0.4", default-features = false }
-parking_lot = { version = "0.12.0", optional = true }
-tracing = { version = "0.1.25", default-features = false }
-tracing-core = { version = "0.1.17", default-features = false }
 
 itp-sgx-externalities = { default-features = false, path = "../externalities" }
 sgx_tstd = { optional = true, features = ["untrusted_fs", "net", "backtrace"], git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
-sgx_types = { optional = true, git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
 
 # Substrate dependencies
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-runtime-interface = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-tracing = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-wasm-interface = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # local
-environmental = { path = "../environmental", default-features = false }
 
 [features]
 default = ["std"]
@@ -35,24 +24,12 @@ std = [
     "log/std",
     "sp-core/std",
     "codec/std",
-    "sp-std/std",
-    "hash-db/std",
     "libsecp256k1/std",
-    "sp-runtime-interface/std",
-    "sp-wasm-interface/std",
-    "futures",
-    "parking_lot",
     "itp-sgx-externalities/std",
-    # local
-    "environmental/std",
 ]
 sgx = [
     "sgx_tstd",
-    "sgx_types",
     "itp-sgx-externalities/sgx",
-    "sp-runtime-interface/disable_target_static_assertions",
-    #local
-    "environmental/sgx",
 ]
 
 # These two features are used for `no_std` builds for the environments which already provides
diff --git a/tee-worker/core-primitives/test/Cargo.toml b/tee-worker/core-primitives/test/Cargo.toml
index cfec756a42..4b6150075a 100644
--- a/tee-worker/core-primitives/test/Cargo.toml
+++ b/tee-worker/core-primitives/test/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-derive_more = { version = "0.99.5" }
 sgx-crypto-helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", package = "sgx_crypto_helper", default-features = false }
 
 # sgx deps
diff --git a/tee-worker/core-primitives/top-pool-author/Cargo.toml b/tee-worker/core-primitives/top-pool-author/Cargo.toml
index a2ce2cc60e..5c0f9377f0 100644
--- a/tee-worker/core-primitives/top-pool-author/Cargo.toml
+++ b/tee-worker/core-primitives/top-pool-author/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 [dependencies]
 # sgx dependencies
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
-sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 # local dependencies
 ita-stf = { path = "../../app-libs/stf", default-features = false }
@@ -19,7 +18,6 @@ itp-stf-state-handler = { path = "../stf-state-handler", default-features = fals
 itp-test = { path = "../test", default-features = false, optional = true }
 itp-top-pool = { path = "../top-pool", default-features = false }
 itp-types = { path = "../types", default-features = false }
-itp-utils = { path = "../utils", default-features = false }
 
 # sgx enabled external libraries
 jsonrpc-core_sgx = { package = "jsonrpc-core", git = "https://github.com/scs/jsonrpc", branch = "no_std_v18", default-features = false, optional = true }
@@ -27,7 +25,6 @@ thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linu
 
 # std compatible external libraries (make sure these versions match with the sgx-enabled ones above)
 jsonrpc-core = { version = "18", optional = true }
-thiserror = { version = "1.0", optional = true }
 
 # no-std compatible libraries
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -36,8 +33,6 @@ log = { version = "0.4", default-features = false }
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
-# litentry
-litentry-primitives = { path = "../../litentry/primitives", default-features = false }
 
 [dev-dependencies]
 futures = { version = "0.3" }
@@ -46,6 +41,9 @@ itp-test = { path = "../test" }
 itp-top-pool = { path = "../top-pool", features = ["mocks"] }
 sgx-crypto-helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", package = "sgx_crypto_helper", default-features = false }
 sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+# litentry
+litentry-primitives = { path = "../../litentry/primitives", default-features = false }
+
 
 [features]
 default = ["std"]
@@ -57,10 +55,8 @@ std = [
     "itp-stf-state-handler/std",
     "itp-top-pool/std",
     "itp-types/std",
-    "itp-utils/std",
     "jsonrpc-core",
     "log/std",
-    "thiserror",
     # litentry
     "litentry-primitives/std",
 ]
@@ -72,7 +68,6 @@ sgx = [
     "itp-sgx-crypto/sgx",
     "itp-stf-state-handler/sgx",
     "itp-top-pool/sgx",
-    "itp-utils/sgx",
     "thiserror_sgx",
     # litentry
     "litentry-primitives/sgx",
diff --git a/tee-worker/core-primitives/top-pool/Cargo.toml b/tee-worker/core-primitives/top-pool/Cargo.toml
index 3b77eb8cba..57cc037413 100644
--- a/tee-worker/core-primitives/top-pool/Cargo.toml
+++ b/tee-worker/core-primitives/top-pool/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 [dependencies]
 # sgx dependencies
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["net", "thread", "untrusted_time"] }
-sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 
 # local dependencies
 ita-stf = { path = "../../app-libs/stf", default-features = false }
@@ -24,30 +23,27 @@ thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linu
 # std compatible external libraries (make sure these versions match with the sgx-enabled ones above)
 jsonrpc-core = { version = "18", optional = true }
 linked-hash-map = { version = "0.5.2", optional = true }
-thiserror = { version = "1.0", optional = true }
 
 # no-std compatible libraries
 byteorder = { version = "1.4.2", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 derive_more = { version = "0.99.5" }
 log = { version = "0.4", default-features = false }
-serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
-sp-application-crypto = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
-# litentry
-litentry-primitives = { path = "../../litentry/primitives", default-features = false }
-
 # dev dependencies (for tests)
 [dev-dependencies]
 parity-util-mem = { version = "0.12.0", default-features = false, features = ["primitive-types"] }
+serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
+sp-application-crypto = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+# litentry
+litentry-primitives = { path = "../../litentry/primitives", default-features = false }
 
 [features]
 default = ["std"]
 sgx = [
     "sgx_tstd",
-    "sgx_types",
     "ita-stf/sgx",
     "itc-direct-rpc-server/sgx",
     "jsonrpc-core_sgx",
@@ -68,7 +64,6 @@ std = [
     "sp-core/std",
     "sp-runtime/std",
     "sp-application-crypto/std",
-    "thiserror",
     # litentry
     "litentry-primitives/std",
 ]
diff --git a/tee-worker/core-primitives/types/Cargo.toml b/tee-worker/core-primitives/types/Cargo.toml
index b70d994672..de43323ae2 100644
--- a/tee-worker/core-primitives/types/Cargo.toml
+++ b/tee-worker/core-primitives/types/Cargo.toml
@@ -8,11 +8,7 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-chrono = { version = "0.4.19", default-features = false, features = ["alloc"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-primitive-types = { version = "0.12.1", default-features = false, features = ["codec"] }
-serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 
 # local dependencies
 itp-sgx-runtime-primitives = { path = "../../core-primitives/sgx-runtime-primitives", default-features = false }
@@ -31,10 +27,6 @@ litentry-primitives = { path = "../../litentry/primitives", default-features = f
 default = ["std"]
 std = [
     "codec/std",
-    "chrono/std",
-    "serde/std",
-    "serde_json/std",
-    "primitive-types/std",
     "itp-sgx-runtime-primitives/std",
     # substrate
     "frame-system/std",
diff --git a/tee-worker/core/direct-rpc-server/Cargo.toml b/tee-worker/core/direct-rpc-server/Cargo.toml
index 432195e633..3dd27f355a 100644
--- a/tee-worker/core/direct-rpc-server/Cargo.toml
+++ b/tee-worker/core/direct-rpc-server/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 [dependencies]
 # sgx dependencies
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["net", "thread"] }
-sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 
 # no-std dependencies
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -53,7 +52,6 @@ sgx = [
     "itp-utils/sgx",
     "jsonrpc-core_sgx",
     "sgx_tstd",
-    "sgx_types",
     "thiserror_sgx",
 ]
 mocks = []
diff --git a/tee-worker/core/offchain-worker-executor/Cargo.toml b/tee-worker/core/offchain-worker-executor/Cargo.toml
index e48bf20685..99e6653133 100644
--- a/tee-worker/core/offchain-worker-executor/Cargo.toml
+++ b/tee-worker/core/offchain-worker-executor/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2021"
 [dependencies]
 # sgx dependencies
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
-sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 # sgx enabled external libraries
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }
@@ -28,7 +27,7 @@ itp-top-pool-author = { path = "../../core-primitives/top-pool-author", default-
 itp-types = { path = "../../core-primitives/types", default-features = false }
 
 # Substrate dependencies
-sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # no-std compatible libraries
@@ -45,9 +44,7 @@ itp-test = { path = "../../core-primitives/test" }
 itp-top-pool-author = { path = "../../core-primitives/top-pool-author", features = ["mocks"] }
 itp-stf-interface = { path = "../../core-primitives/stf-interface", features = ["mocks"] }
 itp-sgx-externalities = { path = "../../core-primitives/substrate-sgx/externalities" }
-sp-io = { path = "../../core-primitives/substrate-sgx/sp-io" }
-
-litentry-primitives = { path = "../../litentry/primitives", default-features = false }
+sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 [features]
 default = ["std"]
@@ -62,8 +59,6 @@ std = [
     "sp-core/std",
     "sp-runtime/std",
     "thiserror",
-    # litentry
-    "litentry-primitives/std",
 ]
 sgx = [
     "ita-stf/sgx",
@@ -74,6 +69,4 @@ sgx = [
     "itp-top-pool-author/sgx",
     "sgx_tstd",
     "thiserror_sgx",
-    # litentry
-    "litentry-primitives/sgx",
 ]
diff --git a/tee-worker/core/parentchain/block-import-dispatcher/Cargo.toml b/tee-worker/core/parentchain/block-import-dispatcher/Cargo.toml
index 24cff2ab8b..1625bd31b5 100644
--- a/tee-worker/core/parentchain/block-import-dispatcher/Cargo.toml
+++ b/tee-worker/core/parentchain/block-import-dispatcher/Cargo.toml
@@ -21,11 +21,9 @@ thiserror = { version = "1.0", optional = true }
 
 # crates.io no-std compatible libraries
 log = { version = "0.4", default-features = false }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 [dev-dependencies]
 itc-parentchain-block-importer = { path = "../block-importer", features = ["mocks"] }
-itp-types = { path = "../../../core-primitives/types" }
 
 [features]
 default = ["std"]
@@ -35,7 +33,6 @@ std = [
     "itp-import-queue/std",
     # no-std compatible libraries
     "log/std",
-    "sp-runtime/std",
     # std-only compatible libraries
     "thiserror",
 ]
diff --git a/tee-worker/core/parentchain/block-importer/Cargo.toml b/tee-worker/core/parentchain/block-importer/Cargo.toml
index 72711ad8d0..dd4121fdd2 100644
--- a/tee-worker/core/parentchain/block-importer/Cargo.toml
+++ b/tee-worker/core/parentchain/block-importer/Cargo.toml
@@ -14,7 +14,6 @@ ita-stf = { path = "../../../app-libs/stf", default-features = false }
 itc-parentchain-indirect-calls-executor = { path = "../indirect-calls-executor", default-features = false }
 itc-parentchain-light-client = { path = "../light-client", default-features = false }
 itp-extrinsics-factory = { path = "../../../core-primitives/extrinsics-factory", default-features = false }
-itp-settings = { path = "../../../core-primitives/settings" }
 itp-stf-executor = { path = "../../../core-primitives/stf-executor", default-features = false }
 itp-types = { path = "../../../core-primitives/types", default-features = false }
 
diff --git a/tee-worker/core/parentchain/indirect-calls-executor/Cargo.toml b/tee-worker/core/parentchain/indirect-calls-executor/Cargo.toml
index 801cba4d24..823af8805b 100644
--- a/tee-worker/core/parentchain/indirect-calls-executor/Cargo.toml
+++ b/tee-worker/core/parentchain/indirect-calls-executor/Cargo.toml
@@ -13,7 +13,6 @@ sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-s
 ita-stf = { path = "../../../app-libs/stf", default-features = false }
 itp-api-client-types = { path = "../../../core-primitives/node-api/api-client-types", default-features = false }
 itp-node-api = { path = "../../../core-primitives/node-api", default-features = false }
-itp-ocall-api = { path = "../../../core-primitives/ocall-api", default-features = false }
 itp-sgx-crypto = { path = "../../../core-primitives/sgx/crypto", default-features = false }
 itp-stf-executor = { path = "../../../core-primitives/stf-executor", default-features = false }
 itp-stf-primitives = { path = "../../../core-primitives/stf-primitives", default-features = false }
@@ -38,17 +37,10 @@ binary-merkle-tree = { default-features = false, git = "https://github.com/parit
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
-# scs/integritee
-substrate-api-client = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.39", default-features = false }
-
 # litentry
-ita-sgx-runtime = { path = "../../../app-libs/sgx-runtime", default-features = false }
-itp-component-container = { path = "../../../core-primitives/component-container", default-features = false, optional = true }
 itp-utils = { path = "../../../core-primitives/utils", default-features = false }
 lc-scheduled-enclave = { path = "../../../litentry/core/scheduled-enclave", default-features = false, optional = true }
 litentry-primitives = { path = "../../../litentry/primitives", default-features = false }
-pallet-imp = { package = "pallet-identity-management", path = "../../../../pallets/identity-management", default-features = false }
-pallet-vcmp = { package = "pallet-vc-management", path = "../../../../pallets/vc-management", default-features = false }
 parachain-core-primitives = { package = "core-primitives", path = "../../../../primitives/core", default-features = false }
 sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
@@ -61,8 +53,8 @@ itp-test = { path = "../../../core-primitives/test" }
 itp-top-pool-author = { path = "../../../core-primitives/top-pool-author", features = ["mocks"] }
 itc-parentchain-test = { path = "../../../core/parentchain/test" }
 
-# litentry
-hex = "0.4.2"
+# scs/integritee
+substrate-api-client = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.39", default-features = false }
 
 [features]
 default = ["std"]
@@ -72,7 +64,6 @@ std = [
     "futures",
     "ita-stf/std",
     "itp-node-api/std",
-    "itp-ocall-api/std",
     "itp-sgx-crypto/std",
     "itp-stf-executor/std",
     "itp-top-pool-author/std",
@@ -85,13 +76,9 @@ std = [
     "sp-runtime/std",
     "thiserror",
     # litentry
-    "ita-sgx-runtime/std",
     "litentry-primitives/std",
-    "pallet-imp/std",
-    "pallet-vcmp/std",
     "itp-utils/std",
     "lc-scheduled-enclave/std",
-    "itp-component-container/std",
 ]
 sgx = [
     "sgx_tstd",
@@ -105,6 +92,5 @@ sgx = [
     # litentry
     "litentry-primitives/sgx",
     "lc-scheduled-enclave/sgx",
-    "itp-component-container/sgx",
     "itp-utils/sgx",
 ]
diff --git a/tee-worker/core/parentchain/light-client/Cargo.toml b/tee-worker/core/parentchain/light-client/Cargo.toml
index 51d8a3bcc3..0fe4638f90 100644
--- a/tee-worker/core/parentchain/light-client/Cargo.toml
+++ b/tee-worker/core/parentchain/light-client/Cargo.toml
@@ -6,12 +6,8 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "chain-error"] }
-derive_more = { version = "0.99.5" }
 finality-grandpa = { version = "0.16.0", default-features = false, features = ["derive-codec"] }
-hash-db = { version = "0.15.2", default-features = false }
-lazy_static = { version = "1.1.0", features = ["spin_no_std"] }
 log = { version = "0.4", default-features = false }
-num = { package = "num-traits", version = "0.2", default-features = false }
 thiserror = { version = "1.0.26", optional = true }
 
 # sgx-deps
@@ -26,12 +22,8 @@ itp-storage = { path = "../../../core-primitives/storage", default-features = fa
 itp-types = { path = "../../../core-primitives/types", default-features = false }
 
 # substrate deps
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-application-crypto = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-finality-grandpa = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-trie = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # test & mock dependencies
 itc-parentchain-test = { optional = true, default-features = false, path = "../../../core/parentchain/test" }
@@ -44,30 +36,24 @@ itc-parentchain-test = { path = "../../../core/parentchain/test" }
 itp-test = { path = "../../../core-primitives/test" }
 itp-sgx-temp-dir = { version = "0.1", path = "../../../core-primitives/sgx/temp-dir" }
 
+
 [features]
 default = ["std"]
 std = [
     "codec/std",
-    "hash-db/std",
-    "num/std",
     "log/std",
     "finality-grandpa/std",
     "thiserror",
 
     # substrate deps
-    "frame-system/std",
-    "sp-core/std",
-    "sp-application-crypto/std",
     "sp-finality-grandpa/std",
     "sp-runtime/std",
-    "sp-trie/std",
 
     # local deps
     "itp-ocall-api/std",
     "itp-storage/std",
     "itp-sgx-io/std",
     "itp-types/std",
-
     # mock deps
     "itp-sgx-temp-dir/std",
 ]
diff --git a/tee-worker/core/parentchain/test/Cargo.toml b/tee-worker/core/parentchain/test/Cargo.toml
index 5685bfc3aa..435f44b09c 100644
--- a/tee-worker/core/parentchain/test/Cargo.toml
+++ b/tee-worker/core/parentchain/test/Cargo.toml
@@ -8,33 +8,15 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
 itp-types = { path = "../../../core-primitives/types", default-features = false }
-log = { version = "0.4", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0", features = ["derive"], optional = true }
 
 # substrate dependencies
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 [features]
 default = ["std"]
 std = [
-    "codec/std",
-    "log/std",
-    "scale-info/std",
-    "serde",
     "itp-types/std",
     # substrate dependencies
-    "frame-support/std",
-    "frame-system/std",
-    "sp-core/std",
-    "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
 ]
diff --git a/tee-worker/core/rest-client/Cargo.toml b/tee-worker/core/rest-client/Cargo.toml
index 495846884d..668ecc4b04 100644
--- a/tee-worker/core/rest-client/Cargo.toml
+++ b/tee-worker/core/rest-client/Cargo.toml
@@ -15,7 +15,6 @@ url = { version = "2.0.0", optional = true }
 http-sgx = { package = "http", git = "https://github.com/integritee-network/http-sgx.git", branch = "sgx-experimental", optional = true }
 http_req-sgx = { optional = true, default-features = false, features = ["rust-tls", "sgx"], package = "http_req", git = "https://github.com/integritee-network/http_req" }
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["net", "thread"] }
-sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }
 url_sgx = { package = "url", git = "https://github.com/mesalock-linux/rust-url-sgx", tag = "sgx_1.1.3", optional = true }
 
@@ -42,7 +41,6 @@ std = [
 sgx = [
     "http-sgx",
     "http_req-sgx",
-    "sgx_types",
     "sgx_tstd",
     "thiserror_sgx",
     "url_sgx",
diff --git a/tee-worker/core/rpc-client/Cargo.toml b/tee-worker/core/rpc-client/Cargo.toml
index 76fabdfa6c..5c54724d4d 100644
--- a/tee-worker/core/rpc-client/Cargo.toml
+++ b/tee-worker/core/rpc-client/Cargo.toml
@@ -11,7 +11,6 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive
 log = "0.4"
 openssl = { version = "0.10" }
 parking_lot = "0.12.1"
-serde_derive = "1.0"
 serde_json = "1.0"
 sgx_crypto_helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 thiserror = { version = "1.0" }
diff --git a/tee-worker/core/rpc-server/Cargo.toml b/tee-worker/core/rpc-server/Cargo.toml
index 5b49f3eb35..f1819c3a82 100644
--- a/tee-worker/core/rpc-server/Cargo.toml
+++ b/tee-worker/core/rpc-server/Cargo.toml
@@ -8,8 +8,7 @@ edition = "2021"
 anyhow = "1.0.40"
 jsonrpsee = { version = "0.2.0-alpha.7", features = ["full"] }
 log = "0.4"
-parity-scale-codec = "3.0.0"
-serde_json = "1.0.64"
+
 tokio = { version = "1.6.1", features = ["full"] }
 
 # local
@@ -29,3 +28,4 @@ std = []
 env_logger = { version = "*" }
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 its-test = { path = "../../sidechain/test" }
+parity-scale-codec = "3.0.0"
diff --git a/tee-worker/core/tls-websocket-server/Cargo.toml b/tee-worker/core/tls-websocket-server/Cargo.toml
index 75f2f3bf6d..687eef5a03 100644
--- a/tee-worker/core/tls-websocket-server/Cargo.toml
+++ b/tee-worker/core/tls-websocket-server/Cargo.toml
@@ -11,9 +11,6 @@ rcgen = { package = "rcgen", default-features = false, git = "https://github.com
 
 # sgx dependencies
 sgx_tstd = { optional = true, features = ["net", "thread"], git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
-sgx_types = { optional = true, git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
-# Todo: should not be needed here: #848
-sgx_crypto_helper = { default-features = false, optional = true, features = ["mesalock_sgx"], version = "1.1.6", git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
 
 # sgx enabled external libraries
 mio-extras = { optional = true, default-features = false, git = "https://github.com/integritee-network/mio-extras-sgx", rev = "963234b" }
@@ -53,8 +50,6 @@ sgx = [
     "rcgen/pem_sgx",
     "rustls_sgx",
     "sgx_tstd",
-    "sgx_types",
-    "sgx_crypto_helper",
     "thiserror_sgx",
     "tungstenite_sgx",
     "webpki_sgx",
diff --git a/tee-worker/enclave-runtime/Cargo.lock b/tee-worker/enclave-runtime/Cargo.lock
index ae2be63a9e..fab908ec52 100644
--- a/tee-worker/enclave-runtime/Cargo.lock
+++ b/tee-worker/enclave-runtime/Cargo.lock
@@ -492,7 +492,6 @@ checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
  "android-tzdata",
  "num-traits 0.2.16",
- "serde 1.0.175",
 ]
 
 [[package]]
@@ -514,13 +513,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "common-primitives"
-version = "0.1.0"
-dependencies = [
- "sp-std",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.4"
@@ -552,7 +544,6 @@ dependencies = [
  "sp-std",
  "strum",
  "strum_macros",
- "xcm",
 ]
 
 [[package]]
@@ -631,31 +622,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
 dependencies = [
  "const-oid",
- "der_derive",
- "flagset",
-]
-
-[[package]]
-name = "der_derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ef71ddb5b3a1f53dee24817c8f70dfa1cb29e804c18d88c228d4bc9c86ee3b9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote 1.0.33",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote 1.0.33",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -678,7 +644,7 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote 1.0.33",
- "rustc_version 0.4.0",
+ "rustc_version",
  "syn 1.0.109",
 ]
 
@@ -847,7 +813,7 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-std",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -1020,12 +986,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "flagset"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499"
-
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -1034,14 +994,6 @@ dependencies = [
  "hashbrown 0.3.1",
 ]
 
-[[package]]
-name = "fork-tree"
-version = "3.0.0"
-dependencies = [
- "parity-scale-codec",
- "sgx_tstd",
-]
-
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
@@ -1192,15 +1144,6 @@ dependencies = [
  "sp-weights",
 ]
 
-[[package]]
-name = "frame-system-rpc-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "parity-scale-codec",
- "sp-api",
-]
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1522,7 +1465,7 @@ dependencies = [
  "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx)",
  "sgx_tstd",
  "unicase",
- "webpki 0.21.4",
+ "webpki",
  "webpki-roots 0.21.0 (git+https://github.com/mesalock-linux/webpki-roots?branch=mesalock_sgx)",
 ]
 
@@ -1652,10 +1595,9 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
  "substrate-fixed",
- "thiserror 1.0.9",
+ "thiserror",
  "url",
 ]
 
@@ -1666,32 +1608,20 @@ dependencies = [
  "frame-executive",
  "frame-support",
  "frame-system",
- "frame-system-rpc-runtime-api",
  "itp-sgx-runtime-primitives",
- "litentry-primitives",
- "pallet-aura",
  "pallet-balances",
  "pallet-evm",
- "pallet-grandpa",
  "pallet-identity-management-tee",
- "pallet-insecure-randomness-collective-flip",
  "pallet-parentchain",
  "pallet-sudo",
  "pallet-timestamp",
  "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
- "sp-block-builder",
- "sp-consensus-aura",
  "sp-core",
- "sp-inherents",
- "sp-offchain",
  "sp-runtime",
- "sp-session",
  "sp-std",
- "sp-transaction-pool",
  "sp-version",
 ]
 
@@ -1713,7 +1643,6 @@ dependencies = [
  "itp-storage",
  "itp-types",
  "itp-utils",
- "lc-scheduled-enclave",
  "lc-stf-task-sender",
  "litentry-primitives",
  "log",
@@ -1721,11 +1650,9 @@ dependencies = [
  "pallet-parentchain",
  "pallet-sudo",
  "parity-scale-codec",
- "ring 0.16.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp",
  "sgx_tstd",
  "sha3 0.10.8",
- "sp-application-crypto",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -1744,9 +1671,8 @@ dependencies = [
  "parity-scale-codec",
  "serde_json 1.0.103",
  "sgx_tstd",
- "sgx_types",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -1763,10 +1689,8 @@ dependencies = [
  "itp-types",
  "log",
  "sgx_tstd",
- "sgx_types",
- "sp-core",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -1791,8 +1715,7 @@ dependencies = [
  "log",
  "sgx_tstd",
  "sgx_types",
- "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -1803,7 +1726,6 @@ dependencies = [
  "itc-parentchain-indirect-calls-executor",
  "itc-parentchain-light-client",
  "itp-extrinsics-factory",
- "itp-settings",
  "itp-stf-executor",
  "itp-types",
  "log",
@@ -1811,7 +1733,7 @@ dependencies = [
  "sgx_tstd",
  "sgx_types",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -1822,12 +1744,9 @@ dependencies = [
  "bs58",
  "core-primitives",
  "futures 0.3.8",
- "ita-sgx-runtime",
  "ita-stf",
  "itp-api-client-types",
- "itp-component-container",
  "itp-node-api",
- "itp-ocall-api",
  "itp-sgx-crypto",
  "itp-stf-executor",
  "itp-stf-primitives",
@@ -1837,26 +1756,20 @@ dependencies = [
  "lc-scheduled-enclave",
  "litentry-primitives",
  "log",
- "pallet-identity-management",
- "pallet-vc-management",
  "parity-scale-codec",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
  "sp-runtime",
  "sp-std",
- "substrate-api-client",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
 name = "itc-parentchain-light-client"
 version = "0.9.0"
 dependencies = [
- "derive_more",
  "finality-grandpa",
- "frame-system",
- "hash-db",
  "itc-parentchain-test",
  "itp-ocall-api",
  "itp-sgx-io",
@@ -1864,34 +1777,21 @@ dependencies = [
  "itp-storage",
  "itp-test",
  "itp-types",
- "lazy_static",
  "log",
- "num-traits 0.2.16",
  "parity-scale-codec",
  "sgx_tstd",
  "sgx_types",
- "sp-application-crypto",
- "sp-core",
  "sp-finality-grandpa",
  "sp-runtime",
- "sp-trie",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
 name = "itc-parentchain-test"
 version = "0.9.0"
 dependencies = [
- "frame-support",
- "frame-system",
  "itp-types",
- "log",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
@@ -1905,8 +1805,7 @@ dependencies = [
  "serde 1.0.175",
  "serde_json 1.0.103",
  "sgx_tstd",
- "sgx_types",
- "thiserror 1.0.9",
+ "thiserror",
  "url",
 ]
 
@@ -1921,13 +1820,11 @@ dependencies = [
  "mio-extras",
  "rcgen",
  "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx)",
- "sgx_crypto_helper",
  "sgx_tstd",
- "sgx_types",
  "sp-core",
- "thiserror 1.0.9",
+ "thiserror",
  "tungstenite",
- "webpki 0.21.4",
+ "webpki",
  "yasna",
 ]
 
@@ -1989,7 +1886,6 @@ dependencies = [
  "itp-sgx-crypto",
  "itp-sgx-io",
  "itp-time-utils",
- "itp-types",
  "log",
  "num-bigint",
  "parity-scale-codec",
@@ -2001,9 +1897,8 @@ dependencies = [
  "sgx_tstd",
  "sgx_types",
  "sp-core",
- "sp-runtime",
- "thiserror 1.0.9",
- "webpki 0.21.4",
+ "thiserror",
+ "webpki",
  "webpki-roots 0.21.0 (git+https://github.com/mesalock-linux/webpki-roots?branch=mesalock_sgx)",
  "yasna",
 ]
@@ -2013,7 +1908,7 @@ name = "itp-component-container"
 version = "0.8.0"
 dependencies = [
  "sgx_tstd",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2041,7 +1936,7 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "substrate-api-client",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2057,7 +1952,7 @@ version = "0.8.0"
 dependencies = [
  "sgx_tstd",
  "sgx_types",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2093,7 +1988,7 @@ version = "0.9.0"
 dependencies = [
  "itp-node-api-metadata",
  "sgx_tstd",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2102,7 +1997,7 @@ version = "0.8.0"
 dependencies = [
  "lazy_static",
  "sgx_tstd",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2125,7 +2020,7 @@ version = "0.9.0"
 dependencies = [
  "lazy_static",
  "sgx_tstd",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2149,7 +2044,6 @@ version = "0.9.0"
 dependencies = [
  "aes",
  "derive_more",
- "itp-settings",
  "itp-sgx-io",
  "itp-sgx-temp-dir",
  "log",
@@ -2220,7 +2114,6 @@ dependencies = [
  "itp-stf-primitives",
  "itp-stf-state-handler",
  "itp-stf-state-observer",
- "itp-storage",
  "itp-test",
  "itp-time-utils",
  "itp-top-pool-author",
@@ -2228,12 +2121,11 @@ dependencies = [
  "litentry-primitives",
  "log",
  "parity-scale-codec",
- "sgx_crypto_helper",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2271,15 +2163,13 @@ dependencies = [
  "itp-stf-state-observer",
  "itp-time-utils",
  "itp-types",
- "lazy_static",
  "log",
  "parity-scale-codec",
  "rust-base58 0.0.4 (git+https://github.com/mesalock-linux/rust-base58-sgx?rev=sgx_1.1.3)",
- "sgx_tcrypto",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2288,9 +2178,8 @@ version = "0.9.0"
 dependencies = [
  "itp-types",
  "log",
- "parity-scale-codec",
  "sgx_tstd",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2308,7 +2197,7 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-trie",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2323,7 +2212,6 @@ dependencies = [
 name = "itp-test"
 version = "0.9.0"
 dependencies = [
- "derive_more",
  "hex 0.4.3",
  "ita-stf",
  "itp-ocall-api",
@@ -2366,16 +2254,12 @@ dependencies = [
  "its-primitives",
  "jsonrpc-core",
  "linked-hash-map",
- "litentry-primitives",
  "log",
  "parity-scale-codec",
- "serde 1.0.175",
  "sgx_tstd",
- "sgx_types",
- "sp-application-crypto",
  "sp-core",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2392,31 +2276,24 @@ dependencies = [
  "itp-test",
  "itp-top-pool",
  "itp-types",
- "itp-utils",
  "jsonrpc-core",
- "litentry-primitives",
  "log",
  "parity-scale-codec",
  "sgx_tstd",
- "sgx_types",
  "sp-core",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
 name = "itp-types"
 version = "0.9.0"
 dependencies = [
- "chrono 0.4.26",
  "frame-system",
  "itp-sgx-runtime-primitives",
  "litentry-primitives",
  "pallet-balances",
  "parity-scale-codec",
- "primitive-types",
- "serde 1.0.175",
- "serde_json 1.0.103",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -2431,7 +2308,7 @@ dependencies = [
  "parity-scale-codec",
  "sgx_tstd",
  "sp-core",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2444,7 +2321,6 @@ dependencies = [
  "itp-sgx-crypto",
  "itp-sgx-externalities",
  "itp-stf-executor",
- "itp-stf-interface",
  "itp-time-utils",
  "itp-top-pool-author",
  "itp-types",
@@ -2456,7 +2332,7 @@ dependencies = [
  "sgx_types",
  "sp-core",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2470,9 +2346,8 @@ dependencies = [
  "log",
  "sgx_tstd",
  "sp-consensus-slots",
- "sp-core",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2480,7 +2355,6 @@ name = "its-consensus-aura"
 version = "0.9.0"
 dependencies = [
  "finality-grandpa",
- "frame-support",
  "ita-stf",
  "itc-parentchain-block-import-dispatcher",
  "itp-enclave-metrics",
@@ -2493,7 +2367,6 @@ dependencies = [
  "itp-time-utils",
  "itp-top-pool-author",
  "itp-types",
- "itp-utils",
  "its-block-composer",
  "its-block-verification",
  "its-consensus-common",
@@ -2513,7 +2386,6 @@ dependencies = [
 name = "its-consensus-common"
 version = "0.9.0"
 dependencies = [
- "fork-tree",
  "itc-parentchain-light-client",
  "itp-extrinsics-factory",
  "itp-import-queue",
@@ -2531,7 +2403,7 @@ dependencies = [
  "sgx_tstd",
  "sgx_types",
  "sp-runtime",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2540,9 +2412,7 @@ version = "0.9.0"
 dependencies = [
  "derive_more",
  "hex 0.4.3",
- "itp-settings",
  "itp-sgx-externalities",
- "itp-sgx-io",
  "itp-stf-state-handler",
  "itp-time-utils",
  "itp-types",
@@ -2567,7 +2437,6 @@ dependencies = [
  "scale-info",
  "serde 1.0.175",
  "sp-core",
- "sp-io",
  "sp-runtime",
  "sp-std",
 ]
@@ -2587,7 +2456,6 @@ dependencies = [
  "parity-scale-codec",
  "rust-base58 0.0.4 (git+https://github.com/mesalock-linux/rust-base58-sgx?rev=sgx_1.1.3)",
  "sgx_tstd",
- "sgx_types",
  "sp-core",
 ]
 
@@ -2615,12 +2483,10 @@ dependencies = [
  "its-primitives",
  "log",
  "parity-scale-codec",
- "serde 1.0.175",
  "sgx_tstd",
  "sp-core",
  "sp-io",
- "sp-std",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2630,14 +2496,12 @@ dependencies = [
  "derive_more",
  "frame-support",
  "itp-ocall-api",
- "itp-storage",
  "itp-teerex-storage",
  "itp-types",
  "parity-scale-codec",
  "sp-core",
  "sp-runtime",
  "sp-std",
- "thiserror 1.0.44",
 ]
 
 [[package]]
@@ -2703,19 +2567,12 @@ version = "0.1.0"
 dependencies = [
  "blake2-rfc",
  "frame-support",
- "futures 0.3.8",
  "hex 0.4.0",
  "http",
  "http_req",
- "ita-stf",
  "itc-rest-client",
  "itp-ocall-api",
- "itp-sgx-crypto",
- "itp-sgx-externalities",
- "itp-stf-executor",
  "itp-stf-primitives",
- "itp-storage",
- "itp-top-pool-author",
  "itp-types",
  "itp-utils",
  "lc-credentials",
@@ -2728,12 +2585,8 @@ dependencies = [
  "serde 1.0.175",
  "serde_json 1.0.103",
  "sgx_tstd",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
  "ss58-registry",
- "thiserror 1.0.9",
+ "thiserror",
  "url",
 ]
 
@@ -2743,18 +2596,11 @@ version = "0.1.0"
 dependencies = [
  "chrono 0.4.11",
  "chrono 0.4.26",
- "futures 0.3.8",
  "hex 0.4.0",
- "http",
- "http_req",
- "itp-ocall-api",
- "itp-sgx-crypto",
- "itp-sgx-externalities",
  "itp-stf-primitives",
  "itp-time-utils",
  "itp-types",
  "itp-utils",
- "lc-data-providers",
  "litentry-primitives",
  "log",
  "parity-scale-codec",
@@ -2766,10 +2612,7 @@ dependencies = [
  "serde_json 1.0.60 (git+https://github.com/mesalock-linux/serde-json-sgx?tag=sgx_1.1.3)",
  "sgx_tstd",
  "sp-core",
- "sp-runtime",
- "sp-std",
- "thiserror 1.0.9",
- "url",
+ "thiserror",
 ]
 
 [[package]]
@@ -2787,7 +2630,7 @@ dependencies = [
  "serde 1.0.175",
  "serde_json 1.0.103",
  "sgx_tstd",
- "thiserror 1.0.9",
+ "thiserror",
  "url",
 ]
 
@@ -2800,27 +2643,13 @@ dependencies = [
  "hex 0.4.0",
  "http",
  "http_req",
- "ita-stf",
- "itc-rest-client",
- "itp-ocall-api",
  "itp-sgx-crypto",
- "itp-sgx-externalities",
- "itp-storage",
- "itp-types",
- "itp-utils",
- "lazy_static",
  "lc-data-providers",
  "lc-stf-task-sender",
  "litentry-primitives",
  "log",
- "parity-scale-codec",
- "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
- "sp-core",
- "sp-io",
- "sp-std",
- "thiserror 1.0.9",
+ "thiserror",
  "url",
 ]
 
@@ -2828,18 +2657,15 @@ dependencies = [
 name = "lc-scheduled-enclave"
 version = "0.8.0"
 dependencies = [
- "itp-component-container",
  "itp-settings",
  "itp-sgx-io",
  "itp-types",
  "lazy_static",
- "litentry-primitives",
  "log",
  "parity-scale-codec",
  "sgx_tstd",
- "sgx_types",
  "sp-std",
- "thiserror 1.0.9",
+ "thiserror",
 ]
 
 [[package]]
@@ -2849,25 +2675,16 @@ dependencies = [
  "frame-support",
  "futures 0.3.8",
  "hex 0.4.0",
- "http",
- "http_req",
  "ita-sgx-runtime",
  "ita-stf",
- "itc-rest-client",
  "itp-enclave-metrics",
- "itp-extrinsics-factory",
- "itp-node-api",
  "itp-ocall-api",
  "itp-sgx-crypto",
  "itp-sgx-externalities",
  "itp-stf-executor",
  "itp-stf-state-handler",
- "itp-stf-state-observer",
- "itp-storage",
  "itp-top-pool-author",
  "itp-types",
- "itp-utils",
- "lazy_static",
  "lc-assertion-build",
  "lc-credentials",
  "lc-data-providers",
@@ -2876,12 +2693,9 @@ dependencies = [
  "litentry-primitives",
  "log",
  "parity-scale-codec",
- "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
  "sp-core",
- "sp-std",
- "thiserror 1.0.9",
+ "thiserror",
  "threadpool",
  "url",
 ]
@@ -2890,24 +2704,16 @@ dependencies = [
 name = "lc-stf-task-sender"
 version = "0.1.0"
 dependencies = [
- "http",
- "http_req",
- "itc-rest-client",
- "itp-ocall-api",
- "itp-sgx-crypto",
  "itp-stf-primitives",
  "itp-types",
- "itp-utils",
  "lazy_static",
  "litentry-primitives",
  "log",
  "parity-scale-codec",
- "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
  "sp-runtime",
  "sp-std",
- "thiserror 1.0.9",
+ "thiserror",
  "url",
 ]
 
@@ -2982,8 +2788,6 @@ dependencies = [
 name = "litentry-primitives"
 version = "0.1.0"
 dependencies = [
- "base64 0.13.0 (git+https://github.com/mesalock-linux/rust-base64-sgx?rev=sgx_1.1.3)",
- "chrono 0.4.11",
  "core-primitives",
  "itp-utils",
  "log",
@@ -2993,7 +2797,6 @@ dependencies = [
  "ring 0.16.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "scale-info",
  "serde 1.0.175",
- "serde_json 1.0.103",
  "sgx_tstd",
  "sp-core",
  "sp-io",
@@ -3261,36 +3064,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "pallet-aura"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "frame-support",
- "frame-system",
- "pallet-timestamp",
- "parity-scale-codec",
- "scale-info",
- "sp-application-crypto",
- "sp-consensus-aura",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-authorship"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "scale-info",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
@@ -3328,47 +3101,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-grandpa"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "frame-support",
- "frame-system",
- "log",
- "pallet-authorship",
- "pallet-session",
- "parity-scale-codec",
- "scale-info",
- "sp-application-crypto",
- "sp-core",
- "sp-finality-grandpa",
- "sp-io",
- "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-identity-management"
-version = "0.1.0"
-dependencies = [
- "core-primitives",
- "frame-support",
- "frame-system",
- "hex 0.4.3",
- "log",
- "pallet-teerex",
- "parity-scale-codec",
- "scale-info",
- "sp-arithmetic",
- "sp-core",
- "sp-runtime",
- "sp-std",
- "teerex-primitives",
-]
-
 [[package]]
 name = "pallet-identity-management-tee"
 version = "0.1.0"
@@ -3380,62 +3112,23 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "serde 1.0.175",
- "serde_derive 1.0.175",
- "serde_json 1.0.103",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-insecure-randomness-collective-flip"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "safe-mix",
- "scale-info",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-parentchain"
 version = "0.9.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "log",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-session"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "log",
- "pallet-timestamp",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
 ]
 
 [[package]]
@@ -3452,24 +3145,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-teerex"
-version = "0.9.0"
-dependencies = [
- "frame-support",
- "frame-system",
- "log",
- "pallet-timestamp",
- "parity-scale-codec",
- "scale-info",
- "sgx-verify",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "teerex-primitives",
-]
-
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
@@ -3501,36 +3176,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-transaction-payment-rpc-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "pallet-transaction-payment",
- "parity-scale-codec",
- "sp-api",
- "sp-runtime",
- "sp-weights",
-]
-
-[[package]]
-name = "pallet-vc-management"
-version = "0.1.0"
-dependencies = [
- "core-primitives",
- "frame-support",
- "frame-system",
- "hex 0.4.3",
- "log",
- "parity-scale-codec",
- "scale-info",
- "sp-arithmetic",
- "sp-core",
- "sp-runtime",
- "sp-std",
- "teerex-primitives",
-]
-
 [[package]]
 name = "parity-scale-codec"
 version = "3.6.4"
@@ -3992,22 +3637,13 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.18",
+ "semver",
 ]
 
 [[package]]
@@ -4020,7 +3656,7 @@ dependencies = [
  "ring 0.16.19",
  "sct",
  "sgx_tstd",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -4033,7 +3669,7 @@ dependencies = [
  "ring 0.16.19",
  "sct",
  "sgx_tstd",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -4046,7 +3682,7 @@ dependencies = [
  "ring 0.16.19",
  "sct",
  "sgx_tstd",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -4061,15 +3697,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
-[[package]]
-name = "safe-mix"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c"
-dependencies = [
- "rustc_version 0.2.3",
-]
-
 [[package]]
 name = "scale-info"
 version = "2.9.0"
@@ -4162,27 +3789,12 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "serde"
 version = "1.0.118"
@@ -4282,28 +3894,6 @@ dependencies = [
  "serde 1.0.175",
 ]
 
-[[package]]
-name = "sgx-verify"
-version = "0.1.4"
-dependencies = [
- "base64 0.13.1",
- "chrono 0.4.26",
- "der",
- "frame-support",
- "hex 0.4.3",
- "parity-scale-codec",
- "ring 0.16.20 (git+https://github.com/Niederb/ring-xous.git?branch=0.16.20-cleanup)",
- "scale-info",
- "serde 1.0.175",
- "serde_json 1.0.103",
- "sp-core",
- "sp-io",
- "sp-std",
- "teerex-primitives",
- "webpki 0.21.0",
- "x509-cert",
-]
-
 [[package]]
 name = "sgx_alloc"
 version = "1.1.6"
@@ -4648,34 +4238,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "sp-block-builder"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "parity-scale-codec",
- "sp-api",
- "sp-inherents",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "sp-consensus-aura"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "sp-api",
- "sp-application-crypto",
- "sp-consensus-slots",
- "sp-inherents",
- "sp-runtime",
- "sp-std",
- "sp-timestamp",
-]
-
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
@@ -4795,31 +4357,12 @@ dependencies = [
 name = "sp-io"
 version = "7.0.0"
 dependencies = [
- "environmental 1.1.3",
- "hash-db",
  "itp-sgx-externalities",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
  "sgx_tstd",
- "sgx_types",
- "sp-core",
- "sp-runtime-interface",
- "sp-std",
- "sp-tracing",
- "sp-wasm-interface",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "sp-offchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "sp-api",
  "sp-core",
- "sp-runtime",
 ]
 
 [[package]]
@@ -4872,19 +4415,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "sp-session"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "sp-api",
- "sp-core",
- "sp-staking",
- "sp-std",
-]
-
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
@@ -4935,15 +4465,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "sp-transaction-pool"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "sp-api",
- "sp-runtime",
-]
-
 [[package]]
 name = "sp-trie"
 version = "7.0.0"
@@ -5013,15 +4534,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "der",
-]
-
 [[package]]
 name = "ss58-registry"
 version = "1.41.0"
@@ -5145,19 +4657,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
-[[package]]
-name = "teerex-primitives"
-version = "0.1.0"
-dependencies = [
- "common-primitives",
- "parity-scale-codec",
- "scale-info",
- "serde 1.0.175",
- "sp-core",
- "sp-io",
- "sp-std",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.0.5"
@@ -5172,16 +4671,7 @@ version = "1.0.9"
 source = "git+https://github.com/mesalock-linux/thiserror-sgx?tag=sgx_1.1.3#c2f806b88616e06aab0af770366a76885d974fdc"
 dependencies = [
  "sgx_tstd",
- "thiserror-impl 1.0.9",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
-dependencies = [
- "thiserror-impl 1.0.44",
+ "thiserror-impl",
 ]
 
 [[package]]
@@ -5194,17 +4684,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "thiserror-impl"
-version = "1.0.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
-dependencies = [
- "proc-macro2",
- "quote 1.0.33",
- "syn 2.0.27",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.0.0"
@@ -5345,10 +4824,10 @@ dependencies = [
  "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?tag=sgx_1.1.3)",
  "sgx_tstd",
  "sha1",
- "thiserror 1.0.9",
+ "thiserror",
  "url",
  "utf-8",
- "webpki 0.21.4",
+ "webpki",
  "webpki-roots 0.21.0 (git+https://github.com/mesalock-linux/webpki-roots?tag=sgx_1.1.3)",
 ]
 
@@ -5535,16 +5014,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.0"
-source = "git+https://github.com/scs/webpki-nostd.git?branch=master#22d1772c39ed9081c2815aadb30e7973f3c4e93f"
-dependencies = [
- "ring 0.16.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "ring 0.16.20 (git+https://github.com/Niederb/ring-xous.git?branch=0.16.20-cleanup)",
- "untrusted",
-]
-
 [[package]]
 name = "webpki"
 version = "0.21.4"
@@ -5561,7 +5030,7 @@ version = "0.21.0"
 source = "git+https://github.com/mesalock-linux/webpki-roots?tag=sgx_1.1.3#6ff3be547ac13ccd46ae55605ad6506ce30688ef"
 dependencies = [
  "sgx_tstd",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -5570,7 +5039,7 @@ version = "0.21.0"
 source = "git+https://github.com/mesalock-linux/webpki-roots?branch=mesalock_sgx#6ff3be547ac13ccd46ae55605ad6506ce30688ef"
 dependencies = [
  "sgx_tstd",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -5613,44 +5082,6 @@ dependencies = [
  "tap",
 ]
 
-[[package]]
-name = "x509-cert"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d224a125dec5adda27d0346b9cae9794830279c4f9c27e4ab0b6c408d54012"
-dependencies = [
- "const-oid",
- "der",
- "flagset",
- "spki",
-]
-
-[[package]]
-name = "xcm"
-version = "0.9.39-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
-dependencies = [
- "bounded-collections",
- "derivative",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "scale-info",
- "sp-weights",
- "xcm-procedural",
-]
-
-[[package]]
-name = "xcm-procedural"
-version = "0.9.39-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
-dependencies = [
- "Inflector",
- "proc-macro2",
- "quote 1.0.33",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "xous"
 version = "0.9.48"
diff --git a/tee-worker/litentry/core/assertion-build/Cargo.toml b/tee-worker/litentry/core/assertion-build/Cargo.toml
index 286b7dc131..1d3c4d49a7 100644
--- a/tee-worker/litentry/core/assertion-build/Cargo.toml
+++ b/tee-worker/litentry/core/assertion-build/Cargo.toml
@@ -9,22 +9,18 @@ version = "0.1.0"
 [dependencies]
 # std dependencies
 blake2-rfc = { version = "0.2.18", default-features = false }
-futures = { version = "0.3.8", optional = true }
 hex = { version = "0.4.3", optional = true }
 http = { version = "0.2", optional = true }
 http_req = { optional = true, features = ["rust-tls"], branch = "master", git = "https://github.com/integritee-network/http_req" }
 rust-base58 = { package = "rust-base58", version = "0.0.4", optional = true }
 ss58-registry = { version = "1.40", default-features = false }
-url = { version = "2.0.0", optional = true }
 
 # sgx dependencies
-futures_sgx = { package = "futures", git = "https://github.com/mesalock-linux/futures-rs-sgx", optional = true }
 hex-sgx = { package = "hex", git = "https://github.com/mesalock-linux/rust-hex-sgx", tag = "sgx_1.1.3", features = ["sgx_tstd"], optional = true }
 http-sgx = { package = "http", git = "https://github.com/integritee-network/http-sgx.git", branch = "sgx-experimental", optional = true }
 http_req-sgx = { optional = true, default-features = false, features = ["rust-tls", "sgx"], package = "http_req", git = "https://github.com/integritee-network/http_req" }
 rust-base58-sgx = { git = "https://github.com/mesalock-linux/rust-base58-sgx", optional = true, package = "rust-base58", features = ["mesalock_sgx"] }
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["net", "thread"] }
-thiserror = { version = "1.0.26", optional = true }
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }
 url_sgx = { package = "url", git = "https://github.com/mesalock-linux/rust-url-sgx", tag = "sgx_1.1.3", optional = true }
 
@@ -35,23 +31,13 @@ serde = { version = "1.0", default-features = false, features = ["derive", "allo
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 
 # internal dependencies
-ita-stf = { path = "../../../app-libs/stf", default-features = false }
 itc-rest-client = { path = "../../../core/rest-client", default-features = false }
 itp-ocall-api = { path = "../../../core-primitives/ocall-api", default-features = false }
-itp-sgx-crypto = { path = "../../../core-primitives/sgx/crypto", default-features = false }
-itp-sgx-externalities = { path = "../../../core-primitives/substrate-sgx/externalities", default-features = false }
-itp-stf-executor = { path = "../../../core-primitives/stf-executor", default-features = false }
 itp-stf-primitives = { default-features = false, path = "../../../core-primitives/stf-primitives" }
-itp-storage = { path = "../../../core-primitives/storage", default-features = false }
-itp-top-pool-author = { path = "../../../core-primitives/top-pool-author", default-features = false }
 itp-types = { path = "../../../core-primitives/types", default-features = false }
 itp-utils = { path = "../../../core-primitives/utils", default-features = false }
 
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", default-features = false }
 
 # litentry
 lc-credentials = { path = "../credentials", default-features = false }
@@ -62,7 +48,6 @@ litentry-primitives = { path = "../../primitives", default-features = false }
 [features]
 default = ["std"]
 sgx = [
-    "futures_sgx",
     "hex-sgx",
     "http-sgx",
     "http_req-sgx",
@@ -71,17 +56,12 @@ sgx = [
     "sgx_tstd",
     "thiserror_sgx",
     "url_sgx",
-    "ita-stf/sgx",
-    "itp-stf-executor/sgx",
-    "itp-sgx-externalities/sgx",
-    "itp-top-pool-author/sgx",
     "litentry-primitives/sgx",
     "lc-stf-task-sender/sgx",
     "lc-credentials/sgx",
     "lc-data-providers/sgx",
 ]
 std = [
-    "futures",
     "hex",
     "http",
     "http_req",
@@ -89,19 +69,9 @@ std = [
     "log/std",
     "serde/std",
     "serde_json/std",
-    "thiserror",
-    "url",
     "rust-base58",
-    "ita-stf/std",
     "itp-types/std",
     "itp-utils/std",
-    "itp-stf-executor/std",
-    "itp-top-pool-author/std",
-    "itp-sgx-externalities/std",
-    "itp-storage/std",
-    "sp-std/std",
-    "sp-io/std",
-    "sp-runtime/std",
     "frame-support/std",
     "litentry-primitives/std",
     "lc-stf-task-sender/std",
diff --git a/tee-worker/litentry/core/credentials/Cargo.toml b/tee-worker/litentry/core/credentials/Cargo.toml
index fbe23ab752..2924f2badd 100644
--- a/tee-worker/litentry/core/credentials/Cargo.toml
+++ b/tee-worker/litentry/core/credentials/Cargo.toml
@@ -7,27 +7,19 @@ version = "0.1.0"
 [dependencies]
 # std dependencies
 chrono = { version = "0.4.19", default-features = false, features = ["alloc"] }
-futures = { version = "0.3.8", optional = true }
 hex = { version = "0.4.3", optional = true }
-http = { version = "0.2", optional = true }
-http_req = { optional = true, features = ["rust-tls"], branch = "master", git = "https://github.com/integritee-network/http_req" }
 rust-base58 = { package = "rust-base58", version = "0.0.4", optional = true }
 scale-info = { version = "2.4.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.38", optional = true }
-url = { version = "2.0.0", optional = true }
 
 # sgx dependencies
 chrono_sgx = { package = "chrono", git = "https://github.com/mesalock-linux/chrono-sgx", optional = true }
-futures_sgx = { package = "futures", git = "https://github.com/mesalock-linux/futures-rs-sgx", optional = true }
 hex-sgx = { package = "hex", git = "https://github.com/mesalock-linux/rust-hex-sgx", tag = "sgx_1.1.3", features = ["sgx_tstd"], optional = true }
-http-sgx = { package = "http", git = "https://github.com/integritee-network/http-sgx.git", branch = "sgx-experimental", optional = true }
-http_req-sgx = { optional = true, default-features = false, features = ["rust-tls", "sgx"], package = "http_req", git = "https://github.com/integritee-network/http_req" }
 rand-sgx = { package = "rand", git = "https://github.com/mesalock-linux/rand-sgx", tag = "sgx_1.1.3", features = ["sgx_tstd"], optional = true }
 rust-base58-sgx = { git = "https://github.com/mesalock-linux/rust-base58-sgx", optional = true, package = "rust-base58", features = ["mesalock_sgx"] }
 serde_json_sgx = { package = "serde_json", tag = "sgx_1.1.3", git = "https://github.com/mesalock-linux/serde-json-sgx", optional = true }
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["net", "thread"] }
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }
-url_sgx = { package = "url", git = "https://github.com/mesalock-linux/rust-url-sgx", tag = "sgx_1.1.3", optional = true }
 
 # no_std dependencies
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -37,55 +29,37 @@ serde = { version = "1.0", default-features = false, features = ["derive", "allo
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 
 # internal dependencies
-itp-ocall-api = { path = "../../../core-primitives/ocall-api", default-features = false }
-itp-sgx-crypto = { path = "../../../core-primitives/sgx/crypto", default-features = false }
-itp-sgx-externalities = { path = "../../../core-primitives/substrate-sgx/externalities", default-features = false }
 itp-stf-primitives = { default-features = false, path = "../../../core-primitives/stf-primitives" }
 itp-time-utils = { path = "../../../core-primitives/time-utils", default-features = false }
 itp-types = { path = "../../../core-primitives/types", default-features = false }
 itp-utils = { path = "../../../core-primitives/utils", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", default-features = false }
 
 # litentry
-lc-data-providers = { path = "../data-providers", default-features = false }
 litentry-primitives = { path = "../../primitives", default-features = false }
 
 [features]
 default = ["std"]
 sgx = [
     "rust-base58-sgx",
-    "futures_sgx",
     "hex-sgx",
-    "http-sgx",
-    "http_req-sgx",
     "sgx_tstd",
     "thiserror_sgx",
-    "url_sgx",
     "chrono_sgx",
     "serde_json_sgx",
-    "itp-sgx-externalities/sgx",
     "litentry-primitives/sgx",
     "rand-sgx",
     "itp-time-utils/sgx",
 ]
 std = [
     "rust-base58",
-    "futures",
     "hex",
-    "http",
-    "http_req",
     "log/std",
     "serde/std",
     "serde_json/std",
     "thiserror",
-    "url",
     "itp-types/std",
     "itp-utils/std",
-    "itp-sgx-externalities/std",
-    "sp-std/std",
-    "sp-runtime/std",
     "litentry-primitives/std",
     "rand",
     "itp-time-utils/std",
diff --git a/tee-worker/litentry/core/data-providers/Cargo.toml b/tee-worker/litentry/core/data-providers/Cargo.toml
index 43ec9c18a7..37fb173277 100644
--- a/tee-worker/litentry/core/data-providers/Cargo.toml
+++ b/tee-worker/litentry/core/data-providers/Cargo.toml
@@ -8,7 +8,6 @@ version = "0.1.0"
 [dependencies]
 # std dependencies
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-hex = { version = "0.4.3", optional = true }
 http = { version = "0.2", optional = true }
 http_req = { optional = true, features = ["rust-tls"], branch = "master", git = "https://github.com/integritee-network/http_req" }
 thiserror = { version = "1.0.26", optional = true }
@@ -52,7 +51,6 @@ sgx = [
     "litentry-primitives/sgx",
 ]
 std = [
-    "hex",
     "http",
     "http_req",
     "thiserror",
diff --git a/tee-worker/litentry/core/identity-verification/Cargo.toml b/tee-worker/litentry/core/identity-verification/Cargo.toml
index 0c8dfd3906..3893a19ef9 100644
--- a/tee-worker/litentry/core/identity-verification/Cargo.toml
+++ b/tee-worker/litentry/core/identity-verification/Cargo.toml
@@ -6,11 +6,7 @@ version = "0.1.0"
 
 [dependencies]
 # std dependencies
-futures = { version = "0.3.8", optional = true }
 hex = { version = "0.4.3", optional = true }
-http = { version = "0.2", optional = true }
-http_req = { optional = true, features = ["rust-tls"], branch = "master", git = "https://github.com/integritee-network/http_req" }
-url = { version = "2.0.0", optional = true }
 
 # sgx dependencies
 futures_sgx = { package = "futures", git = "https://github.com/mesalock-linux/futures-rs-sgx", optional = true }
@@ -18,31 +14,16 @@ hex-sgx = { package = "hex", git = "https://github.com/mesalock-linux/rust-hex-s
 http-sgx = { package = "http", git = "https://github.com/integritee-network/http-sgx.git", branch = "sgx-experimental", optional = true }
 http_req-sgx = { package = "http_req", git = "https://github.com/integritee-network/http_req", default-features = false, features = ["rust-tls", "sgx"], optional = true }
 sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master", features = ["net", "thread"], optional = true }
-thiserror = { version = "1.0.26", optional = true }
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }
 url_sgx = { package = "url", git = "https://github.com/mesalock-linux/rust-url-sgx", tag = "sgx_1.1.3", optional = true }
 
 # no_std dependencies
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-lazy_static = { version = "1.1.0", features = ["spin_no_std"] }
 log = { version = "0.4", default-features = false }
-serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 
 # internal dependencies
-ita-stf = { path = "../../../app-libs/stf", default-features = false }
-itc-rest-client = { path = "../../../core/rest-client", default-features = false }
-itp-ocall-api = { path = "../../../core-primitives/ocall-api", default-features = false }
 itp-sgx-crypto = { path = "../../../core-primitives/sgx/crypto", default-features = false }
-itp-sgx-externalities = { path = "../../../core-primitives/substrate-sgx/externalities", default-features = false }
-itp-storage = { path = "../../../core-primitives/storage", default-features = false }
-itp-types = { path = "../../../core-primitives/types", default-features = false }
-itp-utils = { path = "../../../core-primitives/utils", default-features = false }
 
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", default-features = false }
 
 lc-data-providers = { path = "../data-providers", default-features = false }
 lc-stf-task-sender = { path = "../stf-task/sender", default-features = false }
@@ -55,36 +36,18 @@ sgx = [
     "hex-sgx",
     "http-sgx",
     "http_req-sgx",
-    "itc-rest-client/sgx",
     "sgx_tstd",
     "thiserror_sgx",
     "url_sgx",
-    "ita-stf/sgx",
-    "itp-sgx-externalities/sgx",
     "itp-sgx-crypto/sgx",
     "lc-data-providers/sgx",
     "litentry-primitives/sgx",
     "lc-stf-task-sender/sgx",
 ]
 std = [
-    "futures",
     "hex",
-    "http",
-    "http_req",
-    "itc-rest-client/std",
     "log/std",
-    "serde/std",
-    "serde_json/std",
-    "thiserror",
-    "url",
-    "ita-stf/std",
-    "itp-types/std",
-    "itp-utils/std",
-    "itp-sgx-externalities/std",
-    "itp-storage/std",
     "itp-sgx-crypto/std",
-    "sp-std/std",
-    "sp-io/std",
     "frame-support/std",
     "lc-data-providers/std",
     "litentry-primitives/std",
diff --git a/tee-worker/litentry/core/mock-server/Cargo.toml b/tee-worker/litentry/core/mock-server/Cargo.toml
index d79bdb0979..1b8e8b28fa 100644
--- a/tee-worker/litentry/core/mock-server/Cargo.toml
+++ b/tee-worker/litentry/core/mock-server/Cargo.toml
@@ -5,10 +5,6 @@ version = "0.1.0"
 
 [dependencies]
 hex = "0.4.3"
-#httpmock = "0.6"
-#isahc = "1.7"
-codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
-lazy_static = "1.4"
 log = "0.4"
 serde_json = { version = "1.0", features = ["alloc"] }
 tokio = { version = "1.5", features = ["full"] }
diff --git a/tee-worker/litentry/core/scheduled-enclave/Cargo.toml b/tee-worker/litentry/core/scheduled-enclave/Cargo.toml
index 6f81585cc8..d73b61276a 100644
--- a/tee-worker/litentry/core/scheduled-enclave/Cargo.toml
+++ b/tee-worker/litentry/core/scheduled-enclave/Cargo.toml
@@ -14,15 +14,12 @@ thiserror = { version = "1.0.26", optional = true }
 
 # sgx-deps
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = ["untrusted_fs"], optional = true }
-sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 thiserror-sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }
 
 # local dependencies
-itp-component-container = { path = "../../../core-primitives/component-container", default-features = false }
 itp-settings = { path = "../../../core-primitives/settings" }
 itp-sgx-io = { path = "../../../core-primitives/sgx/io", default-features = false }
 itp-types = { path = "../../../core-primitives/types", default-features = false }
-litentry-primitives = { path = "../../primitives", default-features = false }
 
 [features]
 default = ["std"]
@@ -30,15 +27,11 @@ sgx = [
     "sgx_tstd",
     "thiserror-sgx",
     "itp-sgx-io/sgx",
-    "itp-component-container/sgx",
-    "litentry-primitives/sgx",
 ]
 std = [
     "thiserror",
     "itp-sgx-io/std",
     "itp-types/std",
-    "itp-component-container/std",
-    "litentry-primitives/std",
     "sp-std/std",
     "codec/std",
 ]
diff --git a/tee-worker/litentry/core/stf-task/receiver/Cargo.toml b/tee-worker/litentry/core/stf-task/receiver/Cargo.toml
index d3a55a3abc..4a35022dd6 100644
--- a/tee-worker/litentry/core/stf-task/receiver/Cargo.toml
+++ b/tee-worker/litentry/core/stf-task/receiver/Cargo.toml
@@ -7,18 +7,12 @@ version = "0.1.0"
 [dependencies]
 # std dependencies
 futures = { version = "0.3.8", optional = true }
-hex = { version = "0.4.3", optional = true }
-http = { version = "0.2", optional = true }
-http_req = { optional = true, features = ["rust-tls"], branch = "master", git = "https://github.com/integritee-network/http_req" }
 thiserror = { version = "1.0.26", optional = true }
 threadpool = { version = "1.8.0", optional = true }
-url = { version = "2.0.0", optional = true }
 
 # sgx dependencies
 futures_sgx = { package = "futures", git = "https://github.com/mesalock-linux/futures-rs-sgx", optional = true }
 hex-sgx = { package = "hex", git = "https://github.com/mesalock-linux/rust-hex-sgx", tag = "sgx_1.1.3", features = ["sgx_tstd"], optional = true }
-http-sgx = { package = "http", git = "https://github.com/integritee-network/http-sgx.git", branch = "sgx-experimental", optional = true }
-http_req-sgx = { package = "http_req", git = "https://github.com/integritee-network/http_req", default-features = false, features = ["rust-tls", "sgx"], optional = true }
 sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master", features = ["net", "thread"], optional = true }
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }
 threadpool_sgx = { git = "https://github.com/mesalock-linux/rust-threadpool-sgx", package = "threadpool", tag = "sgx_1.1.3", optional = true }
@@ -26,29 +20,20 @@ url_sgx = { package = "url", git = "https://github.com/mesalock-linux/rust-url-s
 
 # no_std dependencies
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-lazy_static = { version = "1.1.0", features = ["spin_no_std"] }
 log = { version = "0.4", default-features = false }
-serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # internal dependencies
 ita-stf = { path = "../../../../app-libs/stf", default-features = false }
-itc-rest-client = { path = "../../../../core/rest-client", default-features = false }
 itp-types = { path = "../../../../core-primitives/types", default-features = false }
 
 itp-enclave-metrics = { path = "../../../../core-primitives/enclave-metrics", default-features = false }
-itp-extrinsics-factory = { path = "../../../../core-primitives/extrinsics-factory", default-features = false }
-itp-node-api = { path = "../../../../core-primitives/node-api", default-features = false }
 itp-ocall-api = { path = "../../../../core-primitives/ocall-api", default-features = false }
 itp-sgx-crypto = { path = "../../../../core-primitives/sgx/crypto", default-features = false }
 itp-sgx-externalities = { path = "../../../../core-primitives/substrate-sgx/externalities", default-features = false }
 itp-stf-executor = { path = "../../../../core-primitives/stf-executor", default-features = false }
 itp-stf-state-handler = { path = "../../../../core-primitives/stf-state-handler", default-features = false }
-itp-stf-state-observer = { path = "../../../../core-primitives/stf-state-observer", default-features = false }
-itp-storage = { path = "../../../../core-primitives/storage", default-features = false }
 itp-top-pool-author = { path = "../../../../core-primitives/top-pool-author", default-features = false }
-itp-utils = { path = "../../../../core-primitives/utils", default-features = false }
 
 # litentry
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
@@ -59,7 +44,6 @@ lc-data-providers = { path = "../../data-providers", default-features = false }
 lc-identity-verification = { path = "../../identity-verification", default-features = false }
 lc-stf-task-sender = { path = "../sender", default-features = false }
 litentry-primitives = { path = "../../../primitives", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", default-features = false }
 
 [features]
 default = ["std"]
@@ -67,9 +51,6 @@ sgx = [
     "threadpool_sgx",
     "futures_sgx",
     "hex-sgx",
-    "http-sgx",
-    "http_req-sgx",
-    "itc-rest-client/sgx",
     "sgx_tstd",
     "thiserror_sgx",
     "url_sgx",
@@ -78,8 +59,6 @@ sgx = [
     "itp-stf-executor/sgx",
     "itp-stf-state-handler/sgx",
     "itp-top-pool-author/sgx",
-    "itp-stf-state-observer/sgx",
-    "itp-utils/sgx",
     "sp-core/full_crypto",
     "litentry-primitives/sgx",
     "lc-stf-task-sender/sgx",
@@ -91,22 +70,12 @@ sgx = [
 std = [
     "threadpool",
     "futures",
-    "hex",
-    "http",
-    "http_req",
-    "itc-rest-client/std",
     "log/std",
-    "serde/std",
-    "serde_json/std",
     "thiserror",
-    "url",
     "itp-types/std",
-    "itp-utils/std",
     "itp-top-pool-author/std",
-    "itp-storage/std",
     "itp-stf-executor/std",
     "itp-stf-state-handler/std",
-    "itp-stf-state-observer/std",
     "sp-core/std",
     "litentry-primitives/std",
     "lc-stf-task-sender/std",
@@ -114,7 +83,6 @@ std = [
     "lc-assertion-build/std",
     "ita-sgx-runtime/std",
     "frame-support/std",
-    "sp-std/std",
     "lc-credentials/std",
     "lc-data-providers/std",
 ]
diff --git a/tee-worker/litentry/core/stf-task/sender/Cargo.toml b/tee-worker/litentry/core/stf-task/sender/Cargo.toml
index ed5bbe8bb4..8a5551b189 100644
--- a/tee-worker/litentry/core/stf-task/sender/Cargo.toml
+++ b/tee-worker/litentry/core/stf-task/sender/Cargo.toml
@@ -6,14 +6,10 @@ version = "0.1.0"
 
 [dependencies]
 # std dependencies
-http = { version = "0.2", optional = true }
-http_req = { optional = true, features = ["rust-tls"], branch = "master", git = "https://github.com/integritee-network/http_req" }
 thiserror = { version = "1.0.26", optional = true }
 url = { version = "2.0.0", optional = true }
 
 # sgx dependencies
-http-sgx = { package = "http", git = "https://github.com/integritee-network/http-sgx.git", branch = "sgx-experimental", optional = true }
-http_req-sgx = { package = "http_req", git = "https://github.com/integritee-network/http_req", default-features = false, features = ["rust-tls", "sgx"], optional = true }
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = ["net", "thread"], optional = true }
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }
 url_sgx = { package = "url", git = "https://github.com/mesalock-linux/rust-url-sgx", tag = "sgx_1.1.3", optional = true }
@@ -22,19 +18,13 @@ url_sgx = { package = "url", git = "https://github.com/mesalock-linux/rust-url-s
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 lazy_static = { version = "1.1.0", features = ["spin_no_std"] }
 log = { version = "0.4", default-features = false }
-serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 
 # substrate dependencies
 sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", default-features = false }
 
 # internal dependencies
-itc-rest-client = { path = "../../../../core/rest-client", default-features = false }
-itp-ocall-api = { path = "../../../../core-primitives/ocall-api", default-features = false }
-itp-sgx-crypto = { path = "../../../../core-primitives/sgx/crypto", default-features = false }
 itp-types = { path = "../../../../core-primitives/types", default-features = false }
-itp-utils = { path = "../../../../core-primitives/utils", default-features = false }
 
 # litentry
 itp-stf-primitives = { default-features = false, path = "../../../../core-primitives/stf-primitives" }
@@ -43,24 +33,15 @@ litentry-primitives = { path = "../../../primitives", default-features = false }
 [features]
 default = ["std"]
 sgx = [
-    "http-sgx",
-    "http_req-sgx",
-    "itc-rest-client/sgx",
     "sgx_tstd",
     "thiserror_sgx",
     "url_sgx",
 ]
 std = [
-    "http",
-    "http_req",
-    "itc-rest-client/std",
     "log/std",
-    "serde/std",
-    "serde_json/std",
     "sp-runtime/std",
     "sp-std/std",
     "thiserror",
     "url",
     "itp-types/std",
-    "itp-utils/std",
 ]
diff --git a/tee-worker/litentry/pallets/identity-management/Cargo.toml b/tee-worker/litentry/pallets/identity-management/Cargo.toml
index e5452075f8..de7fda1b09 100644
--- a/tee-worker/litentry/pallets/identity-management/Cargo.toml
+++ b/tee-worker/litentry/pallets/identity-management/Cargo.toml
@@ -12,21 +12,14 @@ hex = { version = "0.4", default-features = false }
 log = { version = "0.4", default-features = false }
 scale-info = { version = "2.4.0", default-features = false, features = ["derive"] }
 
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
+litentry-primitives = { path = "../../primitives", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false, optional = true }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-
-serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
-serde_derive = { version = "1.0", default-features = false }
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
-
-litentry-primitives = { path = "../../primitives", default-features = false }
-
 [dev-dependencies]
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 
@@ -41,10 +34,7 @@ std = [
     "sp-core/std",
     "frame-support/std",
     "frame-system/std",
-    "frame-benchmarking/std",
     "log/std",
-    "serde/std",
-    "serde_json/std",
     "pallet-balances/std",
     "litentry-primitives/std",
 ]
diff --git a/tee-worker/litentry/primitives/Cargo.toml b/tee-worker/litentry/primitives/Cargo.toml
index 709299a15f..5df5e6f996 100644
--- a/tee-worker/litentry/primitives/Cargo.toml
+++ b/tee-worker/litentry/primitives/Cargo.toml
@@ -5,9 +5,6 @@ name = "litentry-primitives"
 version = "0.1.0"
 
 [dependencies]
-base64 = { version = "0.13", default-features = false, features = ["alloc"], optional = true }
-base64_sgx = { package = "base64", rev = "sgx_1.1.3", git = "https://github.com/mesalock-linux/rust-base64-sgx", optional = true }
-chrono = { version = "0.4.23", features = ["clock"], optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 hex = { version = "0.4.3", default-features = false, optional = true }
 log = { version = "0.4", default-features = false }
@@ -17,7 +14,6 @@ rand-sgx = { package = "rand", git = "https://github.com/mesalock-linux/rand-sgx
 ring = { version = "0.16.20", default-features = false }
 scale-info = { version = "2.4.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
@@ -26,7 +22,6 @@ strum = { version = "0.25.0", default-features = false }
 strum_macros = { version = "0.25.0", default-features = false }
 
 # sgx dependencies
-chrono_sgx = { package = "chrono", git = "https://github.com/mesalock-linux/chrono-sgx", optional = true }
 sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master", optional = true, features = ["net", "thread"] }
 
 # internal dependencies
@@ -39,16 +34,12 @@ default = ["std"]
 production = []
 sgx = [
     "sgx_tstd",
-    "base64_sgx",
     "rand-sgx",
-    "chrono_sgx",
 ]
 std = [
     "strum/std",
     "hex/std",
-    "base64/std",
     "serde/std",
-    "serde_json/std",
     "itp-utils/std",
     "sp-core/std",
     "sp-std/std",
@@ -57,6 +48,5 @@ std = [
     "ring/std",
     "parentchain-primitives/std",
     "rand",
-    "chrono",
     "log/std",
 ]
diff --git a/tee-worker/service/Cargo.toml b/tee-worker/service/Cargo.toml
index 9c1fc2b8de..b716aa1106 100644
--- a/tee-worker/service/Cargo.toml
+++ b/tee-worker/service/Cargo.toml
@@ -31,7 +31,6 @@ warp = "0.3"
 
 # ipfs
 ipfs-api = "0.11.0"
-sha2 = { version = "0.7", default-features = false }
 
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 primitive-types = { version = "0.12.1", default-features = false, features = ["codec"] }
@@ -45,7 +44,6 @@ itc-parentchain = { path = "../core/parentchain/parentchain-crate" }
 itc-rest-client = { path = "../core/rest-client" }
 itc-rpc-client = { path = "../core/rpc-client" }
 itc-rpc-server = { path = "../core/rpc-server" }
-itp-api-client-types = { path = "../core-primitives/node-api/api-client-types" }
 itp-enclave-api = { path = "../core-primitives/enclave-api" }
 itp-enclave-metrics = { path = "../core-primitives/enclave-metrics" }
 itp-node-api = { path = "../core-primitives/node-api" }
@@ -64,7 +62,6 @@ substrate-api-client = { default-features = false, features = ["std", "ws-client
 
 # Substrate dependencies
 frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", features = ["full_crypto"] }
 sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
@@ -74,8 +71,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "po
 # litentry
 config = "0.13.3"
 ita-stf = { path = "../app-libs/stf", default-features = false }
-itp-node-api-metadata = { path = "../core-primitives/node-api/metadata" }
-itp-rpc = { path = "../core-primitives/rpc" }
 itp-stf-primitives = { path = "../core-primitives/stf-primitives" }
 lc-data-providers = { path = "../litentry/core/data-providers" }
 lc-mock-server = { path = "../litentry/core/mock-server" }
diff --git a/tee-worker/sidechain/block-composer/Cargo.toml b/tee-worker/sidechain/block-composer/Cargo.toml
index e1e32402a0..5259505f0a 100644
--- a/tee-worker/sidechain/block-composer/Cargo.toml
+++ b/tee-worker/sidechain/block-composer/Cargo.toml
@@ -16,7 +16,6 @@ itp-settings = { path = "../../core-primitives/settings", default-features = fal
 itp-sgx-crypto = { path = "../../core-primitives/sgx/crypto", default-features = false }
 itp-sgx-externalities = { path = "../../core-primitives/substrate-sgx/externalities", default-features = false }
 itp-stf-executor = { path = "../../core-primitives/stf-executor", default-features = false }
-itp-stf-interface = { path = "../../core-primitives/stf-interface", default-features = false }
 itp-time-utils = { path = "../../core-primitives/time-utils", default-features = false }
 itp-top-pool-author = { path = "../../core-primitives/top-pool-author", default-features = false }
 itp-types = { path = "../../core-primitives/types", default-features = false }
@@ -44,7 +43,6 @@ std = [
     "itp-sgx-crypto/std",
     "itp-sgx-externalities/std",
     "itp-stf-executor/std",
-    "itp-stf-interface/std",
     "itp-time-utils/std",
     "itp-top-pool-author/std",
     "itp-types/std",
diff --git a/tee-worker/sidechain/block-verification/Cargo.toml b/tee-worker/sidechain/block-verification/Cargo.toml
index b0a11de25c..7ad984ced5 100644
--- a/tee-worker/sidechain/block-verification/Cargo.toml
+++ b/tee-worker/sidechain/block-verification/Cargo.toml
@@ -20,7 +20,7 @@ its-primitives = { default-features = false, path = "../primitives" }
 # substrate deps
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-consensus-slots = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # sgx deps
@@ -52,3 +52,4 @@ sgx = [
 itc-parentchain-test = { path = "../../core/parentchain/test" }
 its-test = { path = "../../sidechain/test" }
 sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
diff --git a/tee-worker/sidechain/consensus/aura/Cargo.toml b/tee-worker/sidechain/consensus/aura/Cargo.toml
index 9a6ec0612d..593e0a358e 100644
--- a/tee-worker/sidechain/consensus/aura/Cargo.toml
+++ b/tee-worker/sidechain/consensus/aura/Cargo.toml
@@ -13,7 +13,6 @@ log = { version = "0.4", default-features = false }
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 
 # substrate deps
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
@@ -30,7 +29,6 @@ itp-stf-state-handler = { path = "../../../core-primitives/stf-state-handler", d
 itp-time-utils = { path = "../../../core-primitives/time-utils", default-features = false }
 itp-top-pool-author = { path = "../../../core-primitives/top-pool-author", default-features = false }
 itp-types = { path = "../../../core-primitives/types", default-features = false }
-itp-utils = { path = "../../../core-primitives/utils", default-features = false }
 its-block-composer = { path = "../../block-composer", default-features = false }
 its-block-verification = { path = "../../block-verification", optional = true, default-features = false }
 its-consensus-common = { path = "../common", default-features = false }
@@ -58,7 +56,6 @@ std = [
     "finality-grandpa/std",
     "log/std",
     #substrate
-    "frame-support/std",
     "sp-core/std",
     "sp-runtime/std",
     #local
@@ -72,7 +69,6 @@ std = [
     "itp-stf-state-handler/std",
     "itp-time-utils/std",
     "itp-types/std",
-    "itp-utils/std",
     "its-block-composer/std",
     "its-block-verification/std",
     "its-consensus-common/std",
@@ -92,7 +88,6 @@ sgx = [
     "itp-stf-executor/sgx",
     "itp-stf-state-handler/sgx",
     "itp-time-utils/sgx",
-    "itp-utils/sgx",
     "its-block-composer/sgx",
     "its-consensus-common/sgx",
     "its-consensus-slots/sgx",
diff --git a/tee-worker/sidechain/consensus/common/Cargo.toml b/tee-worker/sidechain/consensus/common/Cargo.toml
index fd127950b4..0d3c82632e 100644
--- a/tee-worker/sidechain/consensus/common/Cargo.toml
+++ b/tee-worker/sidechain/consensus/common/Cargo.toml
@@ -10,7 +10,6 @@ log = { version = "0.4", default-features = false }
 thiserror = { version = "1.0.26", optional = true }
 
 # local deps
-fork-tree = { path = "../../fork-tree", default-features = false }
 itc-parentchain-light-client = { path = "../../../core/parentchain/light-client", default-features = false }
 itp-extrinsics-factory = { path = "../../../core-primitives/extrinsics-factory", default-features = false }
 itp-import-queue = { path = "../../../core-primitives/import-queue", default-features = false }
@@ -38,6 +37,7 @@ itc-parentchain-test = { path = "../../../core/parentchain/test" }
 itp-sgx-externalities = { default-features = false, path = "../../../core-primitives/substrate-sgx/externalities" }
 itp-test = { path = "../../../core-primitives/test" }
 its-test = { path = "../../test" }
+fork-tree = { path = "../../fork-tree", default-features = false }
 
 # substrate
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
diff --git a/tee-worker/sidechain/consensus/slots/Cargo.toml b/tee-worker/sidechain/consensus/slots/Cargo.toml
index 55e1ce9a2c..603d8bd36c 100644
--- a/tee-worker/sidechain/consensus/slots/Cargo.toml
+++ b/tee-worker/sidechain/consensus/slots/Cargo.toml
@@ -17,7 +17,6 @@ its-block-verification = { path = "../../block-verification", default-features =
 its-primitives = { path = "../../primitives", default-features = false }
 
 # only for slot-stream
-futures = { version = "0.3", optional = true }
 futures-timer = { version = "3.0", optional = true }
 
 # sgx deps
@@ -28,8 +27,6 @@ sp-consensus-slots = { default-features = false, git = "https://github.com/parit
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # local deps
-itp-settings = { path = "../../../core-primitives/settings" }
-itp-sgx-io = { path = "../../../core-primitives/sgx/io", default-features = false }
 itp-time-utils = { path = "../../../core-primitives/time-utils", default-features = false }
 its-consensus-common = { path = "../common", default-features = false }
 
@@ -47,7 +44,7 @@ its-test = { path = "../../test" }
 sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 itp-test = { path = "../../../core-primitives/test" }
 tokio = { version = "1.6.1", features = ["full"] }
-
+itp-settings = { path = "../../../core-primitives/settings" }
 
 [features]
 default = ["std"]
@@ -55,13 +52,11 @@ std = [
     "codec/std",
     "log/std",
     # only for slot-stream
-    "futures",
     "futures-timer",
     # substrate
     "sp-consensus-slots/std",
     "sp-runtime/std",
     # local
-    "itp-sgx-io/std",
     "itp-time-utils/std",
     "itp-types/std",
     "its-primitives/std",
@@ -73,7 +68,6 @@ std = [
     "lc-scheduled-enclave/std",
 ]
 sgx = [
-    "itp-sgx-io/sgx",
     "itp-time-utils/sgx",
     "its-consensus-common/sgx",
     "sgx_tstd",
diff --git a/tee-worker/sidechain/peer-fetch/Cargo.toml b/tee-worker/sidechain/peer-fetch/Cargo.toml
index 9aad253d93..63e2612d91 100644
--- a/tee-worker/sidechain/peer-fetch/Cargo.toml
+++ b/tee-worker/sidechain/peer-fetch/Cargo.toml
@@ -12,7 +12,6 @@ log = { version = "0.4" }
 serde = "1.0"
 serde_json = "1.0"
 thiserror = { version = "1.0" }
-tokio = { version = "1.6.1", features = ["full"] }
 
 # local
 itc-rpc-client = { path = "../../core/rpc-client" }
@@ -24,6 +23,7 @@ its-storage = { path = "../storage" }
 [dev-dependencies]
 # crates.io
 anyhow = "1.0.40"
+tokio = { version = "1.6.1", features = ["full"] }
 # local
 itp-node-api = { path = "../../core-primitives/node-api", features = ["mocks"] }
 itp-test = { path = "../../core-primitives/test" }
diff --git a/tee-worker/sidechain/primitives/Cargo.toml b/tee-worker/sidechain/primitives/Cargo.toml
index fbf27a5518..8c57b02918 100644
--- a/tee-worker/sidechain/primitives/Cargo.toml
+++ b/tee-worker/sidechain/primitives/Cargo.toml
@@ -15,7 +15,6 @@ serde = { version = "1.0.13", default-features = false }
 
 # substrate dependencies
 sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
@@ -31,7 +30,6 @@ std = [
     "serde/std",
     # substrate
     "sp-core/std",
-    "sp-io/std",
     "sp-runtime/std",
     "sp-std/std",
 ]
diff --git a/tee-worker/sidechain/rpc-handler/Cargo.toml b/tee-worker/sidechain/rpc-handler/Cargo.toml
index b34b5ec329..89d8526cc4 100644
--- a/tee-worker/sidechain/rpc-handler/Cargo.toml
+++ b/tee-worker/sidechain/rpc-handler/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 [dependencies]
 # sgx dependencies
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
-sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 # local dependencies
 itp-rpc = { path = "../../core-primitives/rpc", default-features = false }
diff --git a/tee-worker/sidechain/state/Cargo.toml b/tee-worker/sidechain/state/Cargo.toml
index b551156ed0..2269d53872 100644
--- a/tee-worker/sidechain/state/Cargo.toml
+++ b/tee-worker/sidechain/state/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "chain-error"] }
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 log = { version = "0.4", default-features = false }
-serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
 
 # optional std deps
 thiserror = { version = "1.0.9", optional = true }
@@ -27,7 +26,6 @@ sp-io = { optional = true, default-features = false, features = ["disable_oom",
 
 # substrate deps
 sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
 
 # test deps
 [dev-dependencies]
@@ -37,9 +35,7 @@ sp-runtime = { default-features = false, git = "https://github.com/paritytech/su
 default = ["std"]
 std = [
     "log/std",
-    "serde/std",
     # substrate
-    "sp-std/std",
     "sp-core/std",
     # local crates
     "itp-sgx-externalities/std",
diff --git a/tee-worker/sidechain/storage/Cargo.toml b/tee-worker/sidechain/storage/Cargo.toml
index 23b6b5c3b0..96945f0822 100644
--- a/tee-worker/sidechain/storage/Cargo.toml
+++ b/tee-worker/sidechain/storage/Cargo.toml
@@ -15,7 +15,7 @@ thiserror = "1.0"
 
 # integritee
 itp-settings = { path = "../../core-primitives/settings" }
-itp-types = { path = "../../core-primitives/types" }
+
 its-primitives = { path = "../primitives" }
 
 # Substrate dependencies
@@ -28,6 +28,7 @@ temp-dir = "0.1"
 # local
 itp-time-utils = { path = "../../core-primitives/time-utils" }
 its-test = { path = "../test" }
+itp-types = { path = "../../core-primitives/types" }
 
 [features]
 mocks = []
diff --git a/tee-worker/sidechain/test/Cargo.toml b/tee-worker/sidechain/test/Cargo.toml
index 936a61488b..5a8056796f 100644
--- a/tee-worker/sidechain/test/Cargo.toml
+++ b/tee-worker/sidechain/test/Cargo.toml
@@ -8,7 +8,6 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 
 # sgx dependencies
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = ["untrusted_time"], optional = true }
@@ -23,7 +22,6 @@ its-primitives = { path = "../primitives", default_features = false, features =
 [features]
 default = ["std"]
 std = [
-    "codec/std",
     "itp-types/std",
     "its-primitives/std",
     # substrate
diff --git a/tee-worker/sidechain/validateer-fetch/Cargo.toml b/tee-worker/sidechain/validateer-fetch/Cargo.toml
index ad5514238d..456ab0ffa8 100644
--- a/tee-worker/sidechain/validateer-fetch/Cargo.toml
+++ b/tee-worker/sidechain/validateer-fetch/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "chain-error"] }
 derive_more = "0.99.16"
-thiserror = "1.0.26"
 
 # substrate deps
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
@@ -17,7 +16,6 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr
 
 # local deps
 itp-ocall-api = { path = "../../core-primitives/ocall-api", default-features = false }
-itp-storage = { path = "../../core-primitives/storage", default-features = false }
 itp-teerex-storage = { path = "../../core-primitives/teerex-storage", default-features = false }
 itp-types = { path = "../../core-primitives/types", default-features = false }
 
@@ -29,7 +27,6 @@ std = [
     "sp-runtime/std",
     "sp-std/std",
     "itp-types/std",
-    "itp-storage/std",
     "itp-ocall-api/std",
 ]