diff --git a/Cargo.lock b/Cargo.lock
index bc213f421..8f2c3c320 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1028,18 +1028,14 @@ dependencies = [
  "machine 0.1.0",
  "macros 0.1.0",
  "memory-cache 0.1.0",
- "null-engine 0.1.0",
  "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-runtime 0.1.0",
  "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "patricia-trie-ethereum 0.1.0",
  "pod 0.1.0",
  "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp_compress 0.1.0",
- "rlp_derive 0.1.0",
  "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index e47931a14..85be27f95 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -7,7 +7,6 @@ version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-account-db = { path = "account-db", optional = true }
 account-state = { path = "account-state" }
 ansi_term = "0.11"
 basic-authority = { path = "./engines/basic-authority", optional = true} # used by test-helpers feature
@@ -50,10 +49,8 @@ pod = { path = "pod", optional = true }
 trie-db = "0.15.0"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
 rand = "0.6"
-rand_xorshift = "0.1.1"
 rayon = "1.1"
 rlp = "0.4.0"
-rlp_derive = { path = "../util/rlp-derive" }
 rustc-hex = "2"
 serde = "1.0"
 serde_derive = "1.0"
@@ -73,23 +70,21 @@ vm = { path = "vm" }
 [dev-dependencies]
 account-db = { path = "account-db" }
 blooms-db = { path = "../util/blooms-db" }
-ethcore-builtin = { path = "./builtin" }
 criterion = "0.3"
 engine = { path = "./engine", features = ["test-helpers"] }
 env_logger = "0.5"
 ethash = { path = "../ethash" }
 ethcore-accounts = { path = "../accounts" }
+ethcore-builtin = { path = "./builtin" }
 ethjson = { path = "../json", features = ["test-helpers"] }
 ethkey = { path = "../accounts/ethkey" }
 fetch = { path = "../util/fetch" }
 kvdb-memorydb = "0.1"
 kvdb-rocksdb = "0.1.3"
-lazy_static = { version = "1.3" }
+lazy_static = "1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
 macros = { path = "../util/macros" }
-null-engine = { path = "./engines/null-engine" }
 parity-runtime = { path = "../util/runtime" }
-rlp_compress = { path = "../util/rlp-compress" }
 serde_json = "1.0"
 stats = { path = "../util/stats" }
 pod = { path = "pod" }
@@ -126,7 +121,6 @@ test-heavy = []
 # Compile test helpers
 # note[dvdplm]: "basic-authority/test-helpers" is needed so that `generate_dummy_client_with_spec` works
 test-helpers = [
-    "account-db",
     "blooms-db",
     "ethash",
     "ethjson",
diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
index 9c43273a3..f2b2515d4 100644
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -17,41 +17,6 @@
 #![warn(missing_docs, unused_extern_crates)]
 
 //! Ethcore library
-//!
-//! ### Rust version:
-//! - nightly
-//!
-//! ### Supported platforms:
-//! - OSX
-//! - Linux
-//!
-//! ### Building:
-//!
-//! - Ubuntu 14.04 and later:
-//!
-//!   ```bash
-//!
-//!   # install rustup
-//!   curl https://sh.rustup.rs -sSf | sh
-//!
-//!   # download and build parity
-//!   git clone https://github.com/paritytech/parity-ethereum
-//!   cd parity
-//!   cargo build --release
-//!   ```
-//!
-//! - OSX:
-//!
-//!   ```bash
-//!   # install rocksdb && rustup
-//!   brew update
-//!   curl https://sh.rustup.rs -sSf | sh
-//!
-//!   # download and build parity
-//!   git clone https://github.com/paritytech/parity-ethereum
-//!   cd parity
-//!   cargo build --release
-//!   ```
 
 extern crate account_state;
 extern crate ansi_term;
@@ -95,16 +60,18 @@ extern crate verification;
 extern crate vm;
 
 #[cfg(test)]
-extern crate rand_xorshift;
+extern crate account_db;
 #[cfg(test)]
 extern crate ethcore_accounts as accounts;
+#[cfg(test)]
+extern crate stats;
+
 #[cfg(feature = "stratum")]
 extern crate ethcore_stratum;
-#[cfg(any(test, feature = "stratum"))]
+
+#[cfg(feature = "stratum")]
 extern crate ethash;
 
-#[cfg(any(test, feature = "test-helpers"))]
-extern crate account_db;
 #[cfg(any(test, feature = "test-helpers"))]
 extern crate ethkey;
 #[cfg(any(test, feature = "test-helpers"))]
@@ -113,19 +80,17 @@ extern crate ethjson;
 extern crate kvdb_memorydb;
 #[cfg(any(test, feature = "kvdb-rocksdb"))]
 extern crate kvdb_rocksdb;
-#[cfg(any(test, feature = "json-tests"))]
+#[cfg(feature = "json-tests")]
 #[macro_use]
 extern crate lazy_static;
-#[cfg(any(test, feature = "test-helpers"))]
+#[cfg(any(test, feature = "json-tests"))]
 #[macro_use]
 extern crate macros;
-#[cfg(test)]
-extern crate null_engine;
 #[cfg(any(test, feature = "test-helpers"))]
 extern crate pod;
 #[cfg(any(test, feature = "blooms-db"))]
 extern crate blooms_db;
-#[cfg(any(test, feature = "env_logger"))]
+#[cfg(feature = "env_logger")]
 extern crate env_logger;
 #[cfg(test)]
 extern crate serde_json;
@@ -137,8 +102,6 @@ extern crate ethabi_contract;
 #[macro_use]
 extern crate log;
 #[macro_use]
-extern crate rlp_derive;
-#[macro_use]
 extern crate trace_time;
 
 #[cfg_attr(test, macro_use)]
diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs
index d1abd7e37..7558fb696 100644
--- a/ethcore/src/tests/client.rs
+++ b/ethcore/src/tests/client.rs
@@ -38,6 +38,7 @@ use client_traits::{
 	ImportExportBlocks, Tick, ImportBlock
 };
 use spec;
+use stats;
 use machine::executive::{Executive, TransactOptions};
 use miner::{Miner, PendingOrdering, MinerService};
 use account_state::{State, CleanupMode, backend};