diff --git a/client/cli/src/frontier_db_cmd/mapping_db.rs b/client/cli/src/frontier_db_cmd/mapping_db.rs
index fc6b269caf..35983e4b3c 100644
--- a/client/cli/src/frontier_db_cmd/mapping_db.rs
+++ b/client/cli/src/frontier_db_cmd/mapping_db.rs
@@ -40,14 +40,15 @@ pub enum MappingKey {
 	EthBlockOrTransactionHash(H256),
 }
 
-pub struct MappingDb<'a, B: BlockT, C> {
+pub struct MappingDb<'a, B, C> {
 	cmd: &'a FrontierDbCmd,
 	client: Arc<C>,
 	backend: Arc<fc_db::kv::Backend<B, C>>,
 }
 
-impl<'a, B: BlockT, C> MappingDb<'a, B, C>
+impl<'a, B, C> MappingDb<'a, B, C>
 where
+	B: BlockT,
 	C: HeaderBackend<B> + ProvideRuntimeApi<B>,
 	C::Api: EthereumRuntimeRPCApi<B>,
 {
diff --git a/client/cli/src/frontier_db_cmd/meta_db.rs b/client/cli/src/frontier_db_cmd/meta_db.rs
index c94716c7fa..76134dfed4 100644
--- a/client/cli/src/frontier_db_cmd/meta_db.rs
+++ b/client/cli/src/frontier_db_cmd/meta_db.rs
@@ -58,7 +58,7 @@ impl FromStr for MetaKey {
 	}
 }
 
-pub struct MetaDb<'a, B: BlockT, C> {
+pub struct MetaDb<'a, B, C> {
 	cmd: &'a FrontierDbCmd,
 	backend: Arc<fc_db::kv::Backend<B, C>>,
 }
diff --git a/client/cli/src/frontier_db_cmd/mod.rs b/client/cli/src/frontier_db_cmd/mod.rs
index a88194e714..195709fcf1 100644
--- a/client/cli/src/frontier_db_cmd/mod.rs
+++ b/client/cli/src/frontier_db_cmd/mod.rs
@@ -98,12 +98,13 @@ pub enum DbValue<H> {
 }
 
 impl FrontierDbCmd {
-	pub fn run<B: BlockT, C>(
+	pub fn run<B, C>(
 		&self,
 		client: Arc<C>,
 		backend: Arc<fc_db::kv::Backend<B, C>>,
 	) -> sc_cli::Result<()>
 	where
+		B: BlockT,
 		C: HeaderBackend<B> + ProvideRuntimeApi<B>,
 		C::Api: fp_rpc::EthereumRuntimeRPCApi<B>,
 	{
diff --git a/client/db/src/kv/mod.rs b/client/db/src/kv/mod.rs
index 47f85704dd..af82834e0d 100644
--- a/client/db/src/kv/mod.rs
+++ b/client/db/src/kv/mod.rs
@@ -62,7 +62,7 @@ pub mod static_keys {
 }
 
 #[derive(Clone)]
-pub struct Backend<Block: BlockT, C> {
+pub struct Backend<Block, C> {
 	client: Arc<C>,
 	meta: Arc<MetaDb<Block>>,
 	mapping: Arc<MappingDb<Block>>,
@@ -180,7 +180,7 @@ impl<Block: BlockT, C: HeaderBackend<Block>> Backend<Block, C> {
 	}
 }
 
-pub struct MetaDb<Block: BlockT> {
+pub struct MetaDb<Block> {
 	db: Arc<dyn Database<DbHash>>,
 	_marker: PhantomData<Block>,
 }
@@ -247,7 +247,7 @@ pub struct MappingCommitment<Block: BlockT> {
 	pub ethereum_transaction_hashes: Vec<H256>,
 }
 
-pub struct MappingDb<Block: BlockT> {
+pub struct MappingDb<Block> {
 	db: Arc<dyn Database<DbHash>>,
 	write_lock: Arc<Mutex<()>>,
 	_marker: PhantomData<Block>,
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index eea7f396df..916f040aaa 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -22,14 +22,13 @@ use std::sync::Arc;
 
 // Substrate
 pub use sc_client_db::DatabaseSource;
-use sp_runtime::traits::Block as BlockT;
 
 pub mod kv;
 #[cfg(feature = "sql")]
 pub mod sql;
 
 #[derive(Clone)]
-pub enum Backend<Block: BlockT, C> {
+pub enum Backend<Block, C> {
 	KeyValue(Arc<kv::Backend<Block, C>>),
 	#[cfg(feature = "sql")]
 	Sql(Arc<sql::Backend<Block>>),
diff --git a/client/db/src/sql/mod.rs b/client/db/src/sql/mod.rs
index 5de8d96980..86cebf59f4 100644
--- a/client/db/src/sql/mod.rs
+++ b/client/db/src/sql/mod.rs
@@ -93,7 +93,7 @@ pub enum BackendConfig<'a> {
 }
 
 #[derive(Clone)]
-pub struct Backend<Block: BlockT> {
+pub struct Backend<Block> {
 	/// The Sqlite connection.
 	pool: SqlitePool,
 	/// The additional overrides for the logs handler.
@@ -104,7 +104,7 @@ pub struct Backend<Block: BlockT> {
 	num_ops_timeout: i32,
 }
 
-impl<Block: BlockT> Backend<Block>
+impl<Block> Backend<Block>
 where
 	Block: BlockT<Hash = H256>,
 {
diff --git a/client/mapping-sync/src/kv/worker.rs b/client/mapping-sync/src/kv/worker.rs
index b9695382e1..7beccd0f0f 100644
--- a/client/mapping-sync/src/kv/worker.rs
+++ b/client/mapping-sync/src/kv/worker.rs
@@ -98,8 +98,9 @@ impl<Block: BlockT, C, BE> MappingSyncWorker<Block, C, BE> {
 	}
 }
 
-impl<Block: BlockT, C, BE> Stream for MappingSyncWorker<Block, C, BE>
+impl<Block, C, BE> Stream for MappingSyncWorker<Block, C, BE>
 where
+	Block: BlockT,
 	C: ProvideRuntimeApi<Block>,
 	C::Api: EthereumRuntimeRPCApi<Block>,
 	C: HeaderBackend<Block> + StorageProvider<Block, BE>,
diff --git a/client/mapping-sync/src/sql/mod.rs b/client/mapping-sync/src/sql/mod.rs
index 86c5b2db80..89e2d87630 100644
--- a/client/mapping-sync/src/sql/mod.rs
+++ b/client/mapping-sync/src/sql/mod.rs
@@ -63,7 +63,7 @@ pub struct SyncWorker<Block, Backend, Client> {
 	_phantom: std::marker::PhantomData<(Block, Backend, Client)>,
 }
 
-impl<Block: BlockT, Backend, Client> SyncWorker<Block, Backend, Client>
+impl<Block, Backend, Client> SyncWorker<Block, Backend, Client>
 where
 	Block: BlockT<Hash = H256>,
 	Client: ProvideRuntimeApi<Block>,