lib/PublicInbox/ExtSearchIdx.pm   | 23 ++++++++++++-----------
 lib/PublicInbox/LeiStore.pm       | 13 +++++++------
 lib/PublicInbox/SearchIdx.pm      |  8 +-------
 lib/PublicInbox/SearchIdxShard.pm | 30 ------------------------------
 lib/PublicInbox/V2Writable.pm     |  3 +--

diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm
index c358162889760cde1f4ecf6089918b325ba58329..064d993979daef42a16171f5f40f096fa16f4d3a 100644
--- a/lib/PublicInbox/ExtSearchIdx.pm
+++ b/lib/PublicInbox/ExtSearchIdx.pm
@@ -102,7 +102,7 @@ 	my $eidx_key = $xibx->eidx_key;
 	if (my $new_smsg = $req->{new_smsg}) { # 'm' on cross-posted message
 		my $xnum = $req->{xnum};
 		$self->{oidx}->add_xref3($docid, $xnum, $oid, $eidx_key);
-		$idx->shard_add_eidx_info($docid, $eidx_key, $eml);
+		$idx->ipc_do('add_eidx_info', $docid, $eidx_key, $eml);
 		check_batch_limit($req);
 	} else { # 'd'
 		my $rm_eidx_info;
@@ -110,9 +110,10 @@ 		my $nr = $self->{oidx}->remove_xref3($docid, $oid, $eidx_key,
 							\$rm_eidx_info);
 		if ($nr == 0) {
 			$self->{oidx}->eidxq_del($docid);
-			$idx->shard_remove($docid);
+			$idx->ipc_do('xdb_remove', $docid);
 		} elsif ($rm_eidx_info) {
-			$idx->shard_remove_eidx_info($docid, $eidx_key, $eml);
+			$idx->ipc_do('remove_eidx_info',
+					$docid, $eidx_key, $eml);
 			$self->{oidx}->eidxq_add($docid); # yes, add
 		}
 	}
@@ -327,7 +328,7 @@ 			warn "I: unref #$docid $eidx_key $oid\n";
 		}
 	} else {
 		warn "I: remove #$docid $eidx_key @oid\n";
-		$self->idx_shard($docid)->shard_remove($docid);
+		$self->idx_shard($docid)->ipc_do('xdb_remove', $docid);
 	}
 }
 
@@ -440,7 +441,7 @@ 	$idx->index_raw(undef, $eml, $smsg, $ibx->eidx_key);
 	for my $x (reverse @$stable) {
 		$ibx = _ibx_for($self, $sync, $x);
 		my $hdr = delete $x->{hdr} // die 'BUG: no {hdr}';
-		$idx->shard_add_eidx_info($docid, $ibx->eidx_key, $hdr);
+		$idx->ipc_do('add_eidx_info', $docid, $ibx->eidx_key, $hdr);
 	}
 	return if $nr == 1; # likely, all good
 
@@ -483,12 +484,12 @@ 	if (is_bad_blob($oid, $type, $size, $expect_oid)) {
 		my $remain = $self->{oidx}->remove_xref3($docid, $expect_oid);
 		if ($remain == 0) {
 			warn "W: #$docid gone or corrupted\n";
-			$self->idx_shard($docid)->shard_remove($docid);
+			$self->idx_shard($docid)->ipc_do('xdb_remove', $docid);
 		} elsif (my $next_oid = $req->{xr3r}->[++$req->{ix}]->[2]) {
 			$self->git->cat_async($next_oid, \&_reindex_oid, $req);
 		} else {
 			warn "BUG: #$docid gone (UNEXPECTED)\n";
-			$self->idx_shard($docid)->shard_remove($docid);
+			$self->idx_shard($docid)->ipc_do('xdb_remove', $docid);
 		}
 		return;
 	}
@@ -522,7 +523,7 @@ 		warn <<"";
 BUG? #$docid $smsg->{blob} is not referenced by inboxes during reindex
 
 		$self->{oidx}->delete_by_num($docid);
-		$self->idx_shard($docid)->shard_remove($docid);
+		$self->idx_shard($docid)->ipc_do('xdb_remove', $docid);
 		return;
 	}
 
@@ -799,10 +800,10 @@ 			my $idx = $self->idx_shard($docid);
 			if (scalar(@$xr3) == 0) { # all gone
 				$self->{oidx}->delete_by_num($docid);
 				$self->{oidx}->eidxq_del($docid);
-				$idx->shard_remove($docid);
+				$idx->ipc_do('xdb_remove', $docid);
 			} else { # enqueue for reindex of remaining messages
-				$idx->shard_remove_eidx_info($docid,
-							$ibx->eidx_key);
+				$idx->ipc_do('remove_eidx_info',
+						$docid, $ibx->eidx_key);
 				$self->{oidx}->eidxq_add($docid); # yes, add
 			}
 		}
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 07a3198aef85f0109ebbb046e5d3029c255b78e5..d686e95a35699fb72b810cf95b3dd9aeb6711efd 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -146,7 +146,7 @@ 	my ($self, $eml, @kw) = @_;
 	my $eidx = eidx_init($self);
 	my @docids = _docids_for($self, $eml);
 	for my $docid (@docids) {
-		$eidx->idx_shard($docid)->shard_set_keywords($docid, @kw);
+		$eidx->idx_shard($docid)->ipc_do('set_keywords', $docid, @kw);
 	}
 	\@docids;
 }
@@ -156,7 +156,7 @@ 	my ($self, $eml, @kw) = @_;
 	my $eidx = eidx_init($self);
 	my @docids = _docids_for($self, $eml);
 	for my $docid (@docids) {
-		$eidx->idx_shard($docid)->shard_add_keywords($docid, @kw);
+		$eidx->idx_shard($docid)->ipc_do('add_keywords', $docid, @kw);
 	}
 	\@docids;
 }
@@ -166,7 +166,7 @@ 	my ($self, $eml, @kw) = @_;
 	my $eidx = eidx_init($self);
 	my @docids = _docids_for($self, $eml);
 	for my $docid (@docids) {
-		$eidx->idx_shard($docid)->shard_remove_keywords($docid, @kw);
+		$eidx->idx_shard($docid)->ipc_do('remove_keywords', $docid, @kw)
 	}
 	\@docids;
 }
@@ -205,8 +205,9 @@ 	if (my @docids = _docids_for($self, $eml)) {
 		for my $docid (@docids) {
 			my $idx = $eidx->idx_shard($docid);
 			$oidx->add_xref3($docid, -1, $smsg->{blob}, '.');
-			$idx->shard_add_eidx_info($docid, '.', $eml); # List-Id
-			$idx->shard_add_keywords($docid, @kw) if @kw;
+			# add_eidx_info for List-Id
+			$idx->ipc_do('add_eidx_info', $docid, '.', $eml);
+			$idx->ipc_do('add_keywords', $docid, @kw) if @kw;
 		}
 		\@docids;
 	} else {
@@ -215,7 +216,7 @@ 		$oidx->add_overview($eml, $smsg);
 		$oidx->add_xref3($smsg->{num}, -1, $smsg->{blob}, '.');
 		my $idx = $eidx->idx_shard($smsg->{num});
 		$idx->index_raw($msgref, $eml, $smsg);
-		$idx->shard_add_keywords($smsg->{num}, @kw) if @kw;
+		$idx->ipc_do('add_keywords', $smsg->{num}, @kw) if @kw;
 		$smsg;
 	}
 }
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index d83fd4ca6b5abdf5d651a1b708f208990ea0b1a9..da3ac2e3abbb19e8471feb270b2a5c151b931a49 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -552,18 +552,12 @@ }
 
 sub xdb_remove {
 	my ($self, @docids) = @_;
+	$self->begin_txn_lazy;
 	my $xdb = $self->{xdb} or return;
 	for my $docid (@docids) {
 		eval { $xdb->delete_document($docid) };
 		warn "E: #$docid not in in Xapian? $@\n" if $@;
 	}
-}
-
-sub remove_by_docid {
-	my ($self, $num) = @_;
-	die "BUG: remove_by_docid is v2-only\n" if $self->{oidx};
-	$self->begin_txn_lazy;
-	xdb_remove($self, $num) if need_xapian($self);
 }
 
 sub index_git_blob_id {
diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index 68644bc00a57128e920c9e622aa9ddf109177358..43dad959502e7dcaf6479bcc967419f10c80d692 100644
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -54,16 +54,6 @@ 	$smsg->{eidx_key} = $eidx_key if defined $eidx_key;
 	$self->ipc_do('add_message', $eml, $smsg);
 }
 
-sub shard_add_eidx_info {
-	my ($self, $docid, $eidx_key, $eml) = @_;
-	$self->ipc_do('add_eidx_info', $docid, $eidx_key, $eml);
-}
-
-sub shard_remove_eidx_info {
-	my ($self, $docid, $eidx_key, $eml) = @_;
-	$self->ipc_do('remove_eidx_info', $docid, $eidx_key, $eml);
-}
-
 # needed when there's multiple IPC workers and the parent forking
 # causes newer siblings to inherit older siblings sockets
 sub shard_atfork_child {
@@ -91,26 +81,6 @@ sub shard_close {
 	my ($self) = @_;
 	$self->ipc_do('idx_close');
 	$self->ipc_worker_stop;
-}
-
-sub shard_remove {
-	my ($self, $num) = @_;
-	$self->ipc_do('remove_by_docid', $num);
-}
-
-sub shard_set_keywords {
-	my ($self, $docid, @kw) = @_;
-	$self->ipc_do('set_keywords', $docid, @kw);
-}
-
-sub shard_remove_keywords {
-	my ($self, $docid, @kw) = @_;
-	$self->ipc_do('remove_keywords', $docid, @kw);
-}
-
-sub shard_add_keywords {
-	my ($self, $docid, @kw) = @_;
-	$self->ipc_do('add_keywords', $docid, @kw);
 }
 
 sub shard_over_check {
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index cad559c5bddb0a0c4e71c9c307e2135bea7ad2ec..885edbe9170938a46cf42105619546f365d711d8 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -1133,8 +1133,7 @@ sub unindex_oid_aux ($$$) {
 	my ($self, $oid, $mid) = @_;
 	my @removed = $self->{oidx}->remove_oid($oid, $mid);
 	for my $num (@removed) {
-		my $idx = idx_shard($self, $num);
-		$idx->shard_remove($num);
+		idx_shard($self, $num)->ipc_do('xdb_remove', $num);
 	}
 }