diff --git a/substrate/core/consensus/babe/src/tests.rs b/substrate/core/consensus/babe/src/tests.rs
index 85c3101e5e764bcc931285715fa28b10e1212ed3..32ad826cb1683c71b2b42218a58676b04a002fff 100644
--- a/substrate/core/consensus/babe/src/tests.rs
+++ b/substrate/core/consensus/babe/src/tests.rs
@@ -30,7 +30,7 @@ use consensus_common::import_queue::{
 use network::test::*;
 use network::test::{Block as TestBlock, PeersClient};
 use network::config::BoxFinalityProofRequestBuilder;
-use sr_primitives::{generic::DigestItem, traits::{Block as BlockT, DigestFor, NumberFor}};
+use sr_primitives::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
 use network::config::ProtocolConfig;
 use tokio::runtime::current_thread;
 use client::BlockchainEvents;
diff --git a/substrate/srml/authority-discovery/src/lib.rs b/substrate/srml/authority-discovery/src/lib.rs
index c8857630fb022a8c137fc372e7ddb6236809aa25..2ec9e988358cc93c6fb91fceac43e3aaa43ef95b 100644
--- a/substrate/srml/authority-discovery/src/lib.rs
+++ b/substrate/srml/authority-discovery/src/lib.rs
@@ -138,7 +138,6 @@ mod tests {
 	use primitives::testing::KeyStore;
 	use primitives::{crypto::key_types, sr25519, traits::BareCryptoStore, H256};
 	use runtime_io::{with_externalities, TestExternalities};
-	use sr_primitives::generic::UncheckedExtrinsic;
 	use sr_primitives::testing::{Header, UintAuthorityId};
 	use sr_primitives::traits::{ConvertInto, IdentityLookup, OpaqueKeys};
 	use sr_primitives::Perbill;
diff --git a/substrate/srml/generic-asset/src/lib.rs b/substrate/srml/generic-asset/src/lib.rs
index 1f4c395d8d36fd9875d90c4407a040c44217936e..6791ee578526380b4444b1a4c05a7c76a37d60c3 100644
--- a/substrate/srml/generic-asset/src/lib.rs
+++ b/substrate/srml/generic-asset/src/lib.rs
@@ -166,7 +166,7 @@ use support::{
 		Currency, ExistenceRequirement, Imbalance, LockIdentifier, LockableCurrency, ReservableCurrency,
 		SignedImbalance, UpdateBalanceOutcome, WithdrawReason, WithdrawReasons,
 	},
-	Parameter, StorageDoubleMap, StorageMap, StorageValue,
+	Parameter, StorageMap,
 };
 use system::{ensure_signed, ensure_root};
 
diff --git a/substrate/srml/scored-pool/src/lib.rs b/substrate/srml/scored-pool/src/lib.rs
index 4d92caa5592e56f33f0802678695c33602586b16..4739e165d175243b49620475fbea0a1d58951c6a 100644
--- a/substrate/srml/scored-pool/src/lib.rs
+++ b/substrate/srml/scored-pool/src/lib.rs
@@ -91,7 +91,7 @@ mod tests;
 use codec::FullCodec;
 use rstd::prelude::*;
 use support::{
-	StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure,
+	StorageValue, decl_module, decl_storage, decl_event, ensure,
 	traits::{ChangeMembers, InitializeMembers, Currency, Get, ReservableCurrency},
 };
 use system::{self, ensure_root, ensure_signed};
diff --git a/substrate/srml/staking/src/mock.rs b/substrate/srml/staking/src/mock.rs
index 8263e159c12bb63a5eae669e864c7b00b7731a24..d8d36561426761ece8cbf8ab388f9b933e5fe16e 100644
--- a/substrate/srml/staking/src/mock.rs
+++ b/substrate/srml/staking/src/mock.rs
@@ -394,11 +394,6 @@ pub fn check_nominator_exposure(stash: u64) {
 	);
 }
 
-pub fn assert_total_expo(stash: u64, val: u64) {
-	let expo = Staking::stakers(&stash);
-	assert_eq!(expo.total, val, "total exposure mismatch {:?} != {:?}", expo.total, val);
-}
-
 pub fn assert_is_stash(acc: u64) {
 	assert!(Staking::bonded(&acc).is_some(), "Not a stash.");
 }
diff --git a/substrate/srml/support/src/storage/storage_items.rs b/substrate/srml/support/src/storage/storage_items.rs
index 67d301dad96fecef920949089ec84db9b91c9074..24a7f3984a8650b7327196e0d90dd3e875178baf 100644
--- a/substrate/srml/support/src/storage/storage_items.rs
+++ b/substrate/srml/support/src/storage/storage_items.rs
@@ -19,7 +19,7 @@
 //! This crate exports a macro `storage_items!` and traits describing behavior of generated
 //! structs.
 //!
-//! Three kinds of data types are currently supported:
+//! Two kinds of data types are currently supported:
 //!   - values
 //!   - maps
 //!
@@ -758,7 +758,7 @@ mod test3 {
 #[cfg(test)]
 #[allow(dead_code)]
 mod test_append_and_len {
-	use crate::storage::{StorageMap, StorageValue};
+	use crate::storage::{StorageValue};
 	use runtime_io::{with_externalities, TestExternalities};
 	use codec::{Encode, Decode};