diff --git a/bot_bottle/backend/docker/infra.py b/bot_bottle/backend/docker/infra.py
index d2e201bd..1320146a 100644
--- a/bot_bottle/backend/docker/infra.py
+++ b/bot_bottle/backend/docker/infra.py
@@ -32,7 +32,6 @@ from .orchestrator import (
     ORCHESTRATOR_LABEL,
     ORCHESTRATOR_NAME,
     ORCHESTRATOR_NETWORK,
-    ORCHESTRATOR_SOURCE_HASH_LABEL,
 )
 from ...paths import bot_bottle_root
 from ...gateway import (
@@ -86,12 +85,6 @@ class DockerInfraService(InfraService):
         self._orchestrator_label = orchestrator_label
         self._gateway_name = gateway_name
 
-    @property
-    def gateway_name(self) -> str:
-        """The gateway container — the address the launch flow attributes agents
-        against (gateway IP, git-gate provisioning transport, CA fetch)."""
-        return self._gateway_name
-
     def orchestrator(self) -> DockerOrchestrator:
         """The control-plane service. Cheap to reconstruct — `ensure_built`
         builds its image, `ensure_running` brings it up, and the launch flow
@@ -155,8 +148,5 @@ class DockerInfraService(InfraService):
 __all__ = [
     "DockerInfraService",
     "ORCHESTRATOR_NAME",
-    "ORCHESTRATOR_NETWORK",
-    "ORCHESTRATOR_IMAGE",
-    "ORCHESTRATOR_SOURCE_HASH_LABEL",
     "INFRA_NAME",
 ]
diff --git a/bot_bottle/backend/firecracker/infra_vm.py b/bot_bottle/backend/firecracker/infra_vm.py
index 3686464f..8a6e53c1 100644
--- a/bot_bottle/backend/firecracker/infra_vm.py
+++ b/bot_bottle/backend/firecracker/infra_vm.py
@@ -74,11 +74,6 @@ _ROOTFS_IMAGE = {"orchestrator": _ORCHESTRATOR_FC_IMAGE, "gateway": _GATEWAY_IMA
 _ROOTFS_SLACK_MIB = {"orchestrator": 8192, "gateway": 1024}
 
 ORCHESTRATOR_PORT = 8099
-# Gateway data-plane ports (agent-facing): egress proxy, supervise MCP,
-# git-http. Reached by agent VMs via the PREROUTING DNAT to the gateway VM.
-EGRESS_PORT = 9099
-SUPERVISE_PORT = 9100
-GIT_HTTP_PORT = 9420
 
 # The infra VMs make direct upstream connections (gateway egress, and buildah
 # during builds), and the kernel `ip=` cmdline sets no resolver. Public for
diff --git a/bot_bottle/backend/macos_container/infra.py b/bot_bottle/backend/macos_container/infra.py
index c9bac13b..2327480d 100644
--- a/bot_bottle/backend/macos_container/infra.py
+++ b/bot_bottle/backend/macos_container/infra.py
@@ -38,7 +38,6 @@ from .gateway import (
     GATEWAY_IMAGE,
     GATEWAY_NAME,
     GATEWAY_NETWORK,
-    GatewayError,
     MacosGateway,
     ensure_networks,
 )
@@ -53,8 +52,6 @@ from .orchestrator import (
 # `INFRA_NAME` is kept — now aliasing the gateway container — for callers that
 # still import it (probe / reprovision attribute against the gateway).
 INFRA_NAME = GATEWAY_NAME
-# Back-compat alias: the DB volume moved to the orchestrator module.
-INFRA_DB_VOLUME = ORCHESTRATOR_DB_VOLUME
 
 _REPO_ROOT = Path(__file__).resolve().parents[3]
 
@@ -89,10 +86,6 @@ class MacosInfraService(InfraService):
         self._gateway_name = gateway_name
         self._db_volume = db_volume
 
-    @property
-    def gateway_name(self) -> str:
-        return self._gateway_name
-
     def orchestrator(self) -> MacosOrchestrator:
         """The control-plane service on the host-only control network. Cheap to
         reconstruct — the launch flow reads its `url()` / `gateway_url()` /
@@ -162,9 +155,7 @@ class MacosInfraService(InfraService):
 __all__ = [
     "MacosInfraService",
     "OrchestratorStartError",
-    "GatewayError",
     "ORCHESTRATOR_NAME",
     "INFRA_NAME",
-    "INFRA_DB_VOLUME",
     "probe_orchestrator_url",
 ]
diff --git a/tests/unit/test_docker_infra.py b/tests/unit/test_docker_infra.py
index e55a0353..bbd41bfe 100644
--- a/tests/unit/test_docker_infra.py
+++ b/tests/unit/test_docker_infra.py
@@ -33,9 +33,6 @@ class TestDockerInfraService(unittest.TestCase):
             p.start()
             self.addCleanup(p.stop)
 
-    def test_gateway_name(self) -> None:
-        self.assertEqual(GATEWAY_NAME, self.svc.gateway_name)
-
     def test_url_delegates_to_the_orchestrator(self) -> None:
         self.assertEqual("http://127.0.0.1:8099", self.svc.url())