diff --git a/substrate/substrate/client/src/client.rs b/substrate/substrate/client/src/client.rs
index 8efc326310..36353309ce 100644
--- a/substrate/substrate/client/src/client.rs
+++ b/substrate/substrate/client/src/client.rs
@@ -16,7 +16,7 @@
 
 //! Substrate Client
 
-use primitives::{block, AuthorityId};
+use primitives::{self, block, AuthorityId};
 use primitives::block::Id as BlockId;
 use primitives::storage::{StorageKey, StorageData};
 use runtime_support::Hashable;
@@ -24,8 +24,8 @@ use codec::{KeyedVec, Slicable};
 use state_machine::{self, Ext, OverlayedChanges, Backend as StateBackend, CodeExecutor};
 
 use backend::{self, BlockImportOperation};
-use blockchain::{self, Info as ChainInfo, BlockId, Backend as ChainBackend};
-use {error, in_mem, block_builder, runtime_io};
+use blockchain::{self, Info as ChainInfo, Backend as ChainBackend};
+use {error, in_mem, block_builder, runtime_io, bft};
 
 /// Polkadot Client
 #[derive(Debug)]
diff --git a/substrate/substrate/client/src/error.rs b/substrate/substrate/client/src/error.rs
index 46599af18a..179fa7d910 100644
--- a/substrate/substrate/client/src/error.rs
+++ b/substrate/substrate/client/src/error.rs
@@ -18,7 +18,6 @@
 
 use std;
 use state_machine;
-use blockchain;
 use primitives::hexdisplay::HexDisplay;
 
 error_chain! {
diff --git a/substrate/substrate/client/src/lib.rs b/substrate/substrate/client/src/lib.rs
index a81740ef71..6054808f9b 100644
--- a/substrate/substrate/client/src/lib.rs
+++ b/substrate/substrate/client/src/lib.rs
@@ -44,4 +44,4 @@ pub mod block_builder;
 mod client;
 
 pub use client::{Client, ClientInfo, CallResult, ImportResult, BlockStatus, new_in_mem};
-pub use blockchain::{Info as ChainInfo, BlockId};
+pub use blockchain::Info as ChainInfo;