diff --git a/swh/search/cli.py b/swh/search/cli.py
index 8901d88..1819446 100644
--- a/swh/search/cli.py
+++ b/swh/search/cli.py
@@ -1,130 +1,109 @@
 # Copyright (C) 2019-2020  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 # WARNING: do not import unnecessary things here to keep cli startup time under
 # control
 import click
 
 from swh.core.cli import CONTEXT_SETTINGS
 from swh.core.cli import swh as swh_cli_group
 
 
 @swh_cli_group.group(name="search", context_settings=CONTEXT_SETTINGS)
 @click.option(
     "--config-file",
     "-C",
     default=None,
     type=click.Path(exists=True, dir_okay=False,),
     help="Configuration file.",
 )
 @click.pass_context
 def search_cli_group(ctx, config_file):
     """Software Heritage Search tools."""
     from swh.core import config
 
     ctx.ensure_object(dict)
     conf = config.read(config_file)
     ctx.obj["config"] = conf
 
 
 @search_cli_group.command("initialize")
 @click.pass_context
 def initialize(ctx):
     """Creates Elasticsearch indices."""
     from . import get_search
 
     search = get_search(**ctx.obj["config"]["search"])
     search.initialize()
     print("Done.")
 
 
 @search_cli_group.group("journal-client")
 @click.pass_context
 def journal_client(ctx):
     """"""
     pass
 
 
 @journal_client.command("objects")
 @click.option(
     "--stop-after-objects",
     "-m",
     default=None,
     type=int,
     help="Maximum number of objects to replay. Default is to run forever.",
 )
 @click.option(
     "--object-type",
     "-o",
     multiple=True,
     help="Default list of object types to subscribe to",
 )
 @click.option(
     "--prefix", "-p", help="Topic prefix to use (e.g swh.journal.indexed)",
 )
 @click.pass_context
 def journal_client_objects(ctx, stop_after_objects, object_type, prefix):
     """Listens for new objects from the SWH Journal, and schedules tasks
     to run relevant indexers (currently, origin and origin_visit)
     on these new objects.
 
     """
     import functools
 
     from swh.journal.client import get_journal_client
 
     from . import get_search
     from .journal_client import process_journal_objects
 
     config = ctx.obj["config"]
     journal_cfg = config["journal"]
 
     journal_cfg["object_types"] = object_type or journal_cfg.get("object_types", [])
     journal_cfg["prefix"] = prefix or journal_cfg.get("prefix")
     journal_cfg["stop_after_objects"] = stop_after_objects or journal_cfg.get(
         "stop_after_objects"
     )
 
     if len(journal_cfg["object_types"]) == 0:
         raise ValueError("'object_types' must be specified by cli or configuration")
 
     if journal_cfg["prefix"] is None:
         raise ValueError("'prefix' must be specified by cli or configuration")
 
     client = get_journal_client(cls="kafka", **journal_cfg,)
     search = get_search(**config["search"])
 
     worker_fn = functools.partial(process_journal_objects, search=search,)
     nb_messages = 0
     try:
         nb_messages = client.process(worker_fn)
         print("Processed %d messages." % nb_messages)
     except KeyboardInterrupt:
         ctx.exit(0)
     else:
         print("Done.")
     finally:
         client.close()
-
-
-@search_cli_group.command("rpc-serve")
-@click.argument("config-path", required=True)
-@click.option("--host", default="0.0.0.0", help="Host to run the server")
-@click.option("--port", default=5010, type=click.INT, help="Binding port of the server")
-@click.option(
-    "--index-prefix", required=False, help="The prefix to add before the index names"
-)
-@click.option(
-    "--debug/--nodebug",
-    default=True,
-    help="Indicates if the server should run in debug mode",
-)
-def rpc_server(config_path, host, port, index_prefix, debug):
-    """Starts a Software Heritage Indexer RPC HTTP server."""
-    from .api.server import app, load_and_check_config
-
-    api_cfg = load_and_check_config(config_path)
-    app.config.update(api_cfg)
-    app.run(host, port=int(port), index_prefix=index_prefix, debug=bool(debug))