diff --git a/bot_bottle/manifest/index.py b/bot_bottle/manifest/index.py
index 35966b4..8996560 100644
--- a/bot_bottle/manifest/index.py
+++ b/bot_bottle/manifest/index.py
@@ -16,15 +16,10 @@ from typing import Mapping
 
 from ..log import warn
 from .util import ManifestError, as_json_object
-from .agent import ManifestAgent, ManifestAgentProvider
+from .agent import ManifestAgent
 from .bottle import ManifestBottle
-from .egress import (
-    EGRESS_AUTH_SCHEMES,
-    ManifestEgressConfig,
-    ManifestEgressRoute,
-)
 from .extends import merge_bottles_runtime, resolve_bottles
-from .git import ManifestGitEntry, ManifestGitUser, ManifestKeyConfig
+from .git import ManifestGitUser
 from .loader import (
     check_stale_json,
     load_bottle_chain_from_dir,
diff --git a/bot_bottle/orchestrator/__init__.py b/bot_bottle/orchestrator/__init__.py
index 0858e0e..7597a69 100644
--- a/bot_bottle/orchestrator/__init__.py
+++ b/bot_bottle/orchestrator/__init__.py
@@ -82,4 +82,22 @@ def __getattr__(name: str) -> Any:
     return value
 
 
-__all__ = list(_LAZY)
+__all__ = [
+    "BottleRecord",
+    "RegistryStore",
+    "new_identity_token",
+    "BrokerAuthError",
+    "LaunchBroker",
+    "LaunchRequest",
+    "StubBroker",
+    "sign_request",
+    "verify_request",
+    "DockerBroker",
+    "DockerBrokerError",
+    "Gateway",
+    "GatewayError",
+    "Orchestrator",
+    "OrchestratorServer",
+    "dispatch",
+    "make_server",
+]