diff --git a/Cargo.lock b/Cargo.lock
index cca8b014d..7dc6f7bcb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -298,7 +298,6 @@ dependencies = [
  "ethcore-ipc 1.4.0",
  "ethcore-ipc-codegen 1.4.0",
  "ethcore-ipc-nano 1.4.0",
- "ethcore-network 1.5.0",
  "ethcore-util 1.5.0",
  "ethjson 0.1.0",
  "ethkey 0.2.0",
diff --git a/Cargo.toml b/Cargo.toml
index 078d2916c..9d6848b6a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,7 @@ ethstore-cli = ["ethcore/ethstore-cli"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
+light = ["ethcore/light"]
 
 [[bin]]
 path = "parity/main.rs"
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index bd87c422f..2c3d946f4 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -58,5 +58,6 @@ dev = ["clippy"]
 default = []
 benches = []
 ipc = []
+light = []
 ethkey-cli = ["ethkey/cli"]
 ethstore-cli = ["ethstore/cli"]
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 21c5a2366..ee72ea8b8 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -52,7 +52,7 @@ use blockchain::{BlockChain, BlockProvider, TreeRoute, ImportRoute};
 use client::{
 	BlockID, TransactionID, UncleID, TraceId, ClientConfig, BlockChainClient,
 	MiningBlockChainClient, TraceFilter, CallAnalytics, BlockImportError, Mode,
-	ChainNotify, PruningInfo, ProvingBlockChainClient,
+	ChainNotify, PruningInfo,
 };
 use client::Error as ClientError;
 use env_info::EnvInfo;
@@ -1377,7 +1377,8 @@ impl MayPanic for Client {
 	}
 }
 
-impl ProvingBlockChainClient for Client {
+#[cfg(feature = "light")]
+impl ::client::ProvingBlockChainClient for Client {
 	fn prove_storage(&self, key1: H256, key2: H256, from_level: u32, id: BlockID) -> Vec<Bytes> {
 		self.state_at(id)
 			.and_then(move |state| state.prove_storage(key1, key2, from_level).ok())
diff --git a/ethcore/src/client/mod.rs b/ethcore/src/client/mod.rs
index af4daece6..beab88e8a 100644
--- a/ethcore/src/client/mod.rs
+++ b/ethcore/src/client/mod.rs
@@ -27,7 +27,10 @@ pub use self::config::{Mode, ClientConfig, DatabaseCompactionProfile, BlockChain
 pub use self::error::Error;
 pub use self::test_client::{TestBlockChainClient, EachBlockWith};
 pub use self::chain_notify::ChainNotify;
-pub use self::traits::{BlockChainClient, MiningBlockChainClient, ProvingBlockChainClient};
+pub use self::traits::{BlockChainClient, MiningBlockChainClient};
+
+#[cfg(feature = "light")]
+pub use self::traits::ProvingBlockChainClient;
 
 pub use types::ids::*;
 pub use types::trace_filter::Filter as TraceFilter;
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index 7bf17279c..3eed9aa5d 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -278,6 +278,7 @@ pub trait MiningBlockChainClient: BlockChainClient {
 }
 
 /// Extended client interface for providing proofs of the state.
+#[cfg(feature = "light")]
 pub trait ProvingBlockChainClient: BlockChainClient {
 	/// Prove account storage at a specific block id.
 	///
diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
index b3d63d0ae..d39481048 100644
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -31,6 +31,8 @@ use transaction::SignedTransaction;
 use state_db::StateDB;
 
 use util::*;
+
+#[cfg(feature = "light")]
 use util::trie::recorder::{Recorder, BasicRecorder as TrieRecorder};
 
 mod account;
@@ -762,6 +764,7 @@ impl State {
 }
 
 // LES state proof implementations.
+#[cfg(feature = "light")]
 impl State {
 	/// Prove an account's existence or nonexistence in the state trie.
 	/// Returns a merkle proof of the account's trie node with all nodes before `from_level`