diff --git a/ethcore/src/blockchain/block_info.rs b/ethcore/src/blockchain/block_info.rs
index 52fd32291..42f1bd439 100644
--- a/ethcore/src/blockchain/block_info.rs
+++ b/ethcore/src/blockchain/block_info.rs
@@ -17,8 +17,6 @@
 use util::numbers::{U256,H256};
 use header::BlockNumber;
 
-use util::bytes::{FromRawBytesVariable, FromBytesError, ToBytesWithMap};
-
 /// Brief info about inserted block.
 #[derive(Clone)]
 pub struct BlockInfo {
diff --git a/ethcore/src/client/client.rs.in b/ethcore/src/client/client.rs.in
index be43581e8..deebaa857 100644
--- a/ethcore/src/client/client.rs.in
+++ b/ethcore/src/client/client.rs.in
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::marker::PhantomData;
 use std::path::PathBuf;
 use std::collections::{HashSet, HashMap};
 use std::ops::Deref;
@@ -32,8 +31,8 @@ use util::network::*;
 use util::io::*;
 use util::rlp;
 use util::sha3::*;
-use util::{UtilError, CryptoError, Bytes, Signature, Secret, ec};
-use util::rlp::{encode, decode, RlpStream, Rlp, UntrustedRlp};
+use util::{Bytes};
+use util::rlp::{RlpStream, Rlp, UntrustedRlp};
 use util::journaldb;
 use util::journaldb::JournalDB;
 use util::kvdb::*;
@@ -44,8 +43,8 @@ use util::Stream;
 
 // other
 use views::BlockView;
-use error::{Error, ImportError, ExecutionError, BlockError, ImportResult};
-use header::{BlockNumber, Header};
+use error::{ImportError, ExecutionError, BlockError, ImportResult};
+use header::BlockNumber;
 use state::State;
 use spec::Spec;
 use engine::Engine;
diff --git a/ethcore/src/client/mod.rs b/ethcore/src/client/mod.rs
index 67fdbaaec..7a2562f4b 100644
--- a/ethcore/src/client/mod.rs
+++ b/ethcore/src/client/mod.rs
@@ -38,7 +38,7 @@ use util::Itertools;
 use blockchain::TreeRoute;
 use block_queue::BlockQueueInfo;
 use block::{OpenBlock, SealedBlock};
-use header::{BlockNumber, Header};
+use header::{BlockNumber};
 use transaction::{LocalizedTransaction, SignedTransaction};
 use log_entry::LocalizedLogEntry;
 use filter::Filter;
@@ -48,7 +48,6 @@ use receipt::LocalizedReceipt;
 use trace::LocalizedTrace;
 use evm::Factory as EvmFactory;
 use miner::{TransactionImportResult};
-use error::Error as EthError;
 pub use types::call_analytics::CallAnalytics;
 pub use types::block_import_error::BlockImportError;
 
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 025a39c4a..eacf323b5 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -35,11 +35,10 @@ use spec::Spec;
 use block_queue::BlockQueueInfo;
 use block::{OpenBlock, SealedBlock};
 use executive::Executed;
-use error::{ExecutionError};
+use error::ExecutionError;
 use trace::LocalizedTrace;
 
 use miner::{TransactionImportResult, AccountDetails};
-use error::Error as EthError;
 
 /// Test client.
 pub struct TestBlockChainClient {
diff --git a/ethcore/src/client/trace.rs b/ethcore/src/client/trace.rs
index 42e5d4104..3ab01757e 100644
--- a/ethcore/src/client/trace.rs
+++ b/ethcore/src/client/trace.rs
@@ -1,13 +1,11 @@
 
 //! Bridge between Tracedb and Blockchain.
 
-use std::ops::Range;
-use util::{Address, H256};
+use util::{H256};
 use header::BlockNumber;
 use trace::DatabaseExtras as TraceDatabaseExtras;
 use blockchain::{BlockChain, BlockProvider};
 use blockchain::extras::TransactionAddress;
-use super::BlockID;
 pub use types::trace_filter::Filter;
 
 impl TraceDatabaseExtras for BlockChain {
diff --git a/ethcore/src/types/block_import_error.rs b/ethcore/src/types/block_import_error.rs
index 96da43c22..711751e0c 100644
--- a/ethcore/src/types/block_import_error.rs
+++ b/ethcore/src/types/block_import_error.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Block import error related types
+
 use std::mem;
 use ipc::binary::BinaryConvertError;
 use std::collections::VecDeque;
@@ -22,8 +24,11 @@ use std::convert::From;
 
 #[derive(Binary, Debug)]
 pub enum BlockImportError {
+	/// Import error
 	Import(ImportError),
+	/// Block error
 	Block(BlockError),
+	/// Other error
 	Other(String),
 }
 
diff --git a/ethcore/src/types/block_queue_info.rs b/ethcore/src/types/block_queue_info.rs
index 00e9b059f..714f84ece 100644
--- a/ethcore/src/types/block_queue_info.rs
+++ b/ethcore/src/types/block_queue_info.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Block queue info types
+
 use std::mem;
 use ipc::binary::BinaryConvertError;
 use std::collections::VecDeque;
diff --git a/ethcore/src/types/call_analytics.rs b/ethcore/src/types/call_analytics.rs
index 56a6fbb74..3be1299aa 100644
--- a/ethcore/src/types/call_analytics.rs
+++ b/ethcore/src/types/call_analytics.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Call analytics related types
+
 use std::mem;
 use ipc::binary::{BinaryConvertError, BinaryConvertable};
 use std::collections::VecDeque;
diff --git a/ethcore/src/types/trace_filter.rs b/ethcore/src/types/trace_filter.rs
index c374f7273..05cd83bb0 100644
--- a/ethcore/src/types/trace_filter.rs
+++ b/ethcore/src/types/trace_filter.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Trace filter related types
+
 use std::mem;
 use ipc::binary::{BinaryConvertError, BinaryConvertable};
 use std::collections::VecDeque;