diff --git a/pallets/common/src/lib.rs b/pallets/common/src/lib.rs
index 5055b78cdd..2d28979028 100644
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -878,8 +878,8 @@ impl<T: Config> Pallet<T> {
 		<DestroyedCollectionCount<T>>::put(destroyed_collections);
 		<CollectionById<T>>::remove(collection.id);
 		<AdminAmount<T>>::remove(collection.id);
-		<IsAdmin<T>>::remove_prefix((collection.id,), None);
-		<Allowlist<T>>::remove_prefix((collection.id,), None);
+		let _ = <IsAdmin<T>>::clear_prefix((collection.id,), u32::MAX, None);
+		let _ = <Allowlist<T>>::clear_prefix((collection.id,), u32::MAX, None);
 		<CollectionProperties<T>>::remove(collection.id);
 
 		<Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));
diff --git a/pallets/fungible/src/lib.rs b/pallets/fungible/src/lib.rs
index d3a9d97c10..7edec0a661 100644
--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -154,8 +154,8 @@ impl<T: Config> Pallet<T> {
 		PalletCommon::destroy_collection(collection.0, sender)?;
 
 		<TotalSupply<T>>::remove(id);
-		<Balance<T>>::remove_prefix((id,), None);
-		<Allowance<T>>::remove_prefix((id,), None);
+		let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);
 		Ok(())
 	}
 
diff --git a/pallets/nonfungible/src/lib.rs b/pallets/nonfungible/src/lib.rs
index 76f647326c..e7e7cea96e 100644
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -363,13 +363,13 @@ impl<T: Config> Pallet<T> {
 
 		PalletCommon::destroy_collection(collection.0, sender)?;
 
-		<TokenData<T>>::remove_prefix((id,), None);
-		<TokenChildren<T>>::remove_prefix((id,), None);
-		<Owned<T>>::remove_prefix((id,), None);
+		let _ = <TokenData<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <TokenChildren<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);
 		<TokensMinted<T>>::remove(id);
 		<TokensBurnt<T>>::remove(id);
-		<Allowance<T>>::remove_prefix((id,), None);
-		<AccountBalance<T>>::remove_prefix((id,), None);
+		let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);
 		Ok(())
 	}
 
@@ -412,7 +412,7 @@ impl<T: Config> Pallet<T> {
 		<TokensBurnt<T>>::insert(collection.id, burnt);
 		<TokenData<T>>::remove((collection.id, token));
 		<TokenProperties<T>>::remove((collection.id, token));
-		<TokenAuxProperties<T>>::remove_prefix((collection.id, token), None);
+		let _ = <TokenAuxProperties<T>>::clear_prefix((collection.id, token), u32::MAX, None);
 		let old_spender = <Allowance<T>>::take((collection.id, token));
 
 		if let Some(old_spender) = old_spender {
diff --git a/pallets/refungible/src/lib.rs b/pallets/refungible/src/lib.rs
index 3bea36bc6b..a38d28f1da 100644
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -220,12 +220,12 @@ impl<T: Config> Pallet<T> {
 
 		<TokensMinted<T>>::remove(id);
 		<TokensBurnt<T>>::remove(id);
-		<TokenData<T>>::remove_prefix((id,), None);
-		<TotalSupply<T>>::remove_prefix((id,), None);
-		<Balance<T>>::remove_prefix((id,), None);
-		<Allowance<T>>::remove_prefix((id,), None);
-		<Owned<T>>::remove_prefix((id,), None);
-		<AccountBalance<T>>::remove_prefix((id,), None);
+		let _ = <TokenData<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <TotalSupply<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);
 		Ok(())
 	}
 
@@ -243,8 +243,8 @@ impl<T: Config> Pallet<T> {
 		<TokensBurnt<T>>::insert(collection.id, burnt);
 		<TokenData<T>>::remove((collection.id, token_id));
 		<TotalSupply<T>>::remove((collection.id, token_id));
-		<Balance<T>>::remove_prefix((collection.id, token_id), None);
-		<Allowance<T>>::remove_prefix((collection.id, token_id), None);
+		let _ = <Balance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);
+		let _ = <Allowance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);
 		// TODO: ERC721 transfer event
 		Ok(())
 	}
diff --git a/pallets/unique/src/lib.rs b/pallets/unique/src/lib.rs
index f935c89688..07378eb782 100644
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -237,9 +237,7 @@ decl_module! {
 		}
 
 		fn on_runtime_upgrade() -> Weight {
-			let limit = None;
-
-			<VariableMetaDataBasket<T>>::remove_all(limit);
+			let _ = <VariableMetaDataBasket<T>>::clear(u32::MAX, None);
 
 			0
 		}
@@ -313,13 +311,16 @@ decl_module! {
 
 			T::CollectionDispatch::destroy(sender, collection)?;
 
-			<NftTransferBasket<T>>::remove_prefix(collection_id, None);
-			<FungibleTransferBasket<T>>::remove_prefix(collection_id, None);
-			<ReFungibleTransferBasket<T>>::remove_prefix((collection_id,), None);
+			// TODO: basket cleanup should be moved elsewhere
+			// Maybe runtime dispatch.rs should perform it?
+
+			let _ = <NftTransferBasket<T>>::clear_prefix(collection_id, u32::MAX, None);
+			let _ = <FungibleTransferBasket<T>>::clear_prefix(collection_id, u32::MAX, None);
+			let _ = <ReFungibleTransferBasket<T>>::clear_prefix((collection_id,), u32::MAX, None);
 
-			<NftApproveBasket<T>>::remove_prefix(collection_id, None);
-			<FungibleApproveBasket<T>>::remove_prefix(collection_id, None);
-			<RefungibleApproveBasket<T>>::remove_prefix((collection_id,), None);
+			let _ = <NftApproveBasket<T>>::clear_prefix(collection_id, u32::MAX, None);
+			let _ = <FungibleApproveBasket<T>>::clear_prefix(collection_id, u32::MAX, None);
+			let _ = <RefungibleApproveBasket<T>>::clear_prefix((collection_id,), u32::MAX, None);
 
 			Ok(())
 		}