diff --git a/config/common.pr b/config/common.pr
index ada7702..00ef7e2 100644
--- a/config/common.pr
+++ b/config/common.pr
@@ -4,14 +4,12 @@
 ;
 ;---------------------------------------------------------------------------
 
-; Expose the gatekeeper on port 9001:
-<require-service <relay-listener <tcp "0.0.0.0" 9001> $gatekeeper>>
-
-; Create a dataspace entity, and register it with the gatekeeper with name `"syndicate"` and an
-; empty secret key:
+; Create the main dataspace:
 let ?ds = dataspace
 <MainDataspace $ds>
-<bind "syndicate" #x"" $ds>
+
+; Expose the main dataspace directly on port 9001:
+<require-service <relay-listener <tcp "0.0.0.0" 9001> $ds>>
 
 $ds ?? <log ?ts ?detail> [
   $log ! <log $ts $detail>
diff --git a/src/index.ts b/src/index.ts
index 3576779..95a1140 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -206,8 +206,6 @@ function bootApp(ds: Ref, runningEngine: RunningEngine) {
             const id = uuid();
 
             const url = wsurl();
-            const serverCap = Sturdy.asSturdyRef(new Reader<Ref>(
-                '<ref "syndicate" [] #[pkgN9TBmEd3Q04grVG4Zdw==]>').next());
             const relayAddr = wsRelay.RelayAddress(Schemas.transportAddress.WebSocket(url));
 
             field email: string = localStorage.getItem('userEmail') ?? id;
@@ -221,11 +219,12 @@ function bootApp(ds: Ref, runningEngine: RunningEngine) {
 
             field route: wsRelay.Noise.Route<Ref> = wsRelay.Noise.Route<Ref>({
                 "transports": [fromJS(relayAddr)],
-                "steps": [wsRelay.Noise.RouteStep.GatekeeperStep(serverCap)],
+                "steps": [],
             });
 
             during wsRelay.Resolved({
                 "route": route.value,
+                "addr": $addr: wsRelay.RelayAddress,
                 "resolved": $remoteDs_e: Embedded,
             }) => {
                 const remoteDs = remoteDs_e.embeddedValue;
@@ -234,7 +233,7 @@ function bootApp(ds: Ref, runningEngine: RunningEngine) {
                 log('connected');
 
                 on message wakeDetector.WakeEvent() => {
-                    send message wsRelay.ForceRelayDisconnect(relayAddr);
+                    send message wsRelay.ForceRelayDisconnect(addr);
                 }
 
                 react {