diff --git a/Cargo.lock b/Cargo.lock
index 82379128a706..ff1e44348b68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9056,7 +9056,6 @@ dependencies = [
  "anyhow",
  "async-trait",
  "hex",
- "jsonrpsee",
  "rand 0.8.5",
  "secrecy",
  "semver",
@@ -9065,7 +9064,6 @@ dependencies = [
  "thiserror",
  "tokio",
  "tracing",
- "zksync_basic_types",
  "zksync_concurrency",
  "zksync_config",
  "zksync_consensus_bft",
@@ -9080,7 +9078,6 @@ dependencies = [
  "zksync_l1_contract_interface",
  "zksync_merkle_tree",
  "zksync_metadata_calculator",
- "zksync_multivm",
  "zksync_node_api_server",
  "zksync_node_genesis",
  "zksync_node_sync",
@@ -9088,7 +9085,6 @@ dependencies = [
  "zksync_protobuf",
  "zksync_state",
  "zksync_state_keeper",
- "zksync_storage",
  "zksync_system_constants",
  "zksync_test_account",
  "zksync_types",
diff --git a/core/node/api_server/src/execution_sandbox/mod.rs b/core/node/api_server/src/execution_sandbox/mod.rs
index 82af3e2d6f80..79c6123642cc 100644
--- a/core/node/api_server/src/execution_sandbox/mod.rs
+++ b/core/node/api_server/src/execution_sandbox/mod.rs
@@ -12,7 +12,7 @@ use zksync_types::{
     api, fee_model::BatchFeeInput, AccountTreeId, Address, L1BatchNumber, L2BlockNumber, L2ChainId,
 };
 
-pub use self::execute::TransactionExecutor; // FIXME: remove
+pub use self::execute::TransactionExecutor; // FIXME (PLA-1018): remove
 use self::vm_metrics::SandboxStage;
 pub(super) use self::{
     error::SandboxExecutionError,
diff --git a/core/node/consensus/Cargo.toml b/core/node/consensus/Cargo.toml
index ba52892584d2..707bd957d810 100644
--- a/core/node/consensus/Cargo.toml
+++ b/core/node/consensus/Cargo.toml
@@ -11,7 +11,6 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-zksync_basic_types.workspace = true
 zksync_config.workspace = true
 zksync_concurrency.workspace = true
 zksync_consensus_crypto.workspace = true
@@ -35,9 +34,7 @@ zksync_utils.workspace = true
 zksync_web3_decl.workspace = true
 zksync_node_api_server.workspace = true
 zksync_state.workspace = true
-zksync_storage.workspace = true
 zksync_vm_interface.workspace = true
-zksync_multivm.workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 secrecy.workspace = true
@@ -46,7 +43,6 @@ thiserror.workspace = true
 tracing.workspace = true
 hex.workspace = true
 tokio.workspace = true
-jsonrpsee.workspace = true
 semver.workspace = true
 
 [dev-dependencies]
diff --git a/core/node/consensus/src/en.rs b/core/node/consensus/src/en.rs
index e1f10b8e4e50..cf7e4173e8dc 100644
--- a/core/node/consensus/src/en.rs
+++ b/core/node/consensus/src/en.rs
@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use anyhow::Context as _;
-use jsonrpsee::{core::ClientError, types::error::ErrorCode};
 use zksync_concurrency::{ctx, error::Wrap as _, scope, time};
 use zksync_consensus_executor::{self as executor, attestation};
 use zksync_consensus_roles::{attester, validator};
@@ -12,6 +11,7 @@ use zksync_types::L2BlockNumber;
 use zksync_web3_decl::{
     client::{DynClient, L2},
     error::is_retriable,
+    jsonrpsee::{core::ClientError, types::error::ErrorCode},
     namespaces::{EnNamespaceClient as _, EthNamespaceClient as _},
 };
 
diff --git a/core/node/consensus/src/vm.rs b/core/node/consensus/src/vm.rs
index bdbfc8e03fd4..11b6b5c67e3b 100644
--- a/core/node/consensus/src/vm.rs
+++ b/core/node/consensus/src/vm.rs
@@ -1,7 +1,6 @@
 use anyhow::Context as _;
 use zksync_concurrency::{ctx, error::Wrap as _, scope};
 use zksync_consensus_roles::attester;
-use zksync_multivm::interface::TxExecutionMode;
 use zksync_node_api_server::{
     execution_sandbox::{TransactionExecutor, TxSetupArgs, VmConcurrencyLimiter},
     tx_sender::MultiVMBaseSystemContracts,
@@ -11,7 +10,9 @@ use zksync_system_constants::DEFAULT_L2_TX_GAS_PER_PUBDATA_BYTE;
 use zksync_types::{
     ethabi, fee::Fee, fee_model::BatchFeeInput, l2::L2Tx, AccountTreeId, L2ChainId, Nonce, U256,
 };
-use zksync_vm_interface::{ExecutionResult, OneshotTracingParams, TxExecutionArgs};
+use zksync_vm_interface::{
+    ExecutionResult, OneshotTracingParams, TxExecutionArgs, TxExecutionMode,
+};
 
 use crate::{abi, storage::ConnectionPool};
 
@@ -46,7 +47,7 @@ impl VM {
         }
     }
 
-    // FIXME: switch to oneshot executor
+    // FIXME (PLA-1018): switch to oneshot executor
     pub async fn call<F: abi::Function>(
         &self,
         ctx: &ctx::Ctx,