diff --git a/substrate/client/network-gossip/src/lib.rs b/substrate/client/network-gossip/src/lib.rs
index 55c2fc8206..5dc40471f1 100644
--- a/substrate/client/network-gossip/src/lib.rs
+++ b/substrate/client/network-gossip/src/lib.rs
@@ -123,16 +123,7 @@ impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
 	}
 
 	fn remove_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>) {
-		let addr =
-			iter::once(multiaddr::Protocol::P2p(who.into())).collect::<multiaddr::Multiaddr>();
-		let result = NetworkService::remove_peers_from_reserved_set(
-			self,
-			protocol,
-			iter::once(addr).collect(),
-		);
-		if let Err(err) = result {
-			log::error!(target: "gossip", "remove_set_reserved failed: {}", err);
-		}
+		NetworkService::remove_peers_from_reserved_set(self, protocol, iter::once(who).collect());
 	}
 
 	fn disconnect_peer(&self, who: PeerId, protocol: Cow<'static, str>) {
diff --git a/substrate/client/network/src/service.rs b/substrate/client/network/src/service.rs
index 72b382c990..be19b44f3a 100644
--- a/substrate/client/network/src/service.rs
+++ b/substrate/client/network/src/service.rs
@@ -1164,25 +1164,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	}
 
 	/// Remove peers from a peer set.
-	///
-	/// Each `Multiaddr` must end with a `/p2p/` component containing the `PeerId`.
-	///
-	/// Returns an `Err` if one of the given addresses is invalid or contains an
-	/// invalid peer ID (which includes the local peer ID).
-	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for
-	// convenience.
-	pub fn remove_peers_from_reserved_set(
-		&self,
-		protocol: Cow<'static, str>,
-		peers: HashSet<Multiaddr>,
-	) -> Result<(), String> {
-		let peers = self.split_multiaddr_and_peer_id(peers)?;
-		for (peer_id, _) in peers.into_iter() {
+	pub fn remove_peers_from_reserved_set(&self, protocol: Cow<'static, str>, peers: Vec<PeerId>) {
+		for peer_id in peers.into_iter() {
 			let _ = self
 				.to_worker
 				.unbounded_send(ServiceToWorkerMsg::RemoveSetReserved(protocol.clone(), peer_id));
 		}
-		Ok(())
 	}
 
 	/// Configure an explicit fork sync request.
@@ -1233,25 +1220,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// Remove peers from a peer set.
 	///
 	/// If we currently have an open substream with this peer, it will soon be closed.
-	///
-	/// Each `Multiaddr` must end with a `/p2p/` component containing the `PeerId`.
-	///
-	/// Returns an `Err` if one of the given addresses is invalid or contains an
-	/// invalid peer ID (which includes the local peer ID).
-	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for
-	// convenience.
-	pub fn remove_from_peers_set(
-		&self,
-		protocol: Cow<'static, str>,
-		peers: HashSet<Multiaddr>,
-	) -> Result<(), String> {
-		let peers = self.split_multiaddr_and_peer_id(peers)?;
-		for (peer_id, _) in peers.into_iter() {
+	pub fn remove_from_peers_set(&self, protocol: Cow<'static, str>, peers: Vec<PeerId>) {
+		for peer_id in peers.into_iter() {
 			let _ = self
 				.to_worker
 				.unbounded_send(ServiceToWorkerMsg::RemoveFromPeersSet(protocol.clone(), peer_id));
 		}
-		Ok(())
 	}
 
 	/// Returns the number of peers we're connected to.
diff --git a/substrate/client/network/src/transactions.rs b/substrate/client/network/src/transactions.rs
index 9565466ea1..99350f603a 100644
--- a/substrate/client/network/src/transactions.rs
+++ b/substrate/client/network/src/transactions.rs
@@ -317,15 +317,10 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 				}
 			},
 			Event::SyncDisconnected { remote } => {
-				let addr = iter::once(multiaddr::Protocol::P2p(remote.into()))
-					.collect::<multiaddr::Multiaddr>();
-				let result = self.service.remove_peers_from_reserved_set(
+				self.service.remove_peers_from_reserved_set(
 					self.protocol_name.clone(),
-					iter::once(addr).collect(),
+					iter::once(remote).collect(),
 				);
-				if let Err(err) = result {
-					log::error!(target: "sync", "Removing reserved peer failed: {}", err);
-				}
 			},
 
 			Event::NotificationStreamOpened { remote, protocol, role, .. }