diff --git a/runtime-rpc/src/main/java/org/capnproto/RpcSystem.java b/runtime-rpc/src/main/java/org/capnproto/RpcSystem.java
index fba8bf4..cb6eff2 100644
--- a/runtime-rpc/src/main/java/org/capnproto/RpcSystem.java
+++ b/runtime-rpc/src/main/java/org/capnproto/RpcSystem.java
@@ -15,7 +15,7 @@ public class RpcSystem<VatId extends StructReader> {
     private final Map<VatNetwork.Connection<VatId>, RpcState<VatId>> connections = new ConcurrentHashMap<>();
 
     public RpcSystem(VatNetwork<VatId> network) {
-        this(network, (BootstrapFactory)null);
+        this(network, (BootstrapFactory<VatId>)null);
     }
 
     public RpcSystem(VatNetwork<VatId> network,
@@ -26,12 +26,6 @@ public class RpcSystem<VatId extends StructReader> {
     public RpcSystem(VatNetwork<VatId> network,
                      Capability.Client bootstrapInterface) {
         this(network, new BootstrapFactory<VatId>() {
-
-            @Override
-            public FromPointerReader<VatId> getVatIdFactory() {
-                return this.getVatIdFactory();
-            }
-
             @Override
             public Capability.Client createFor(VatId clientId) {
                 return bootstrapInterface;
@@ -47,7 +41,7 @@ public class RpcSystem<VatId extends StructReader> {
     }
 
     public Capability.Client bootstrap(VatId vatId) {
-        var connection = this.getNetwork().connect(vatId);
+        var connection = this.network.connect(vatId);
         if (connection != null) {
             var state = getConnectionState(connection);
             var hook = state.restore();
@@ -66,15 +60,14 @@ public class RpcSystem<VatId extends StructReader> {
     }
 
     RpcState<VatId> getConnectionState(VatNetwork.Connection<VatId> connection) {
-        var state = this.connections.computeIfAbsent(connection, conn -> {
+        return this.connections.computeIfAbsent(connection, conn -> {
             var onDisconnect = new CompletableFuture<RpcState.DisconnectInfo>();
             onDisconnect.thenCompose(info -> {
                         this.connections.remove(connection);
-                        return info.shutdownPromise.thenRun(() -> connection.close());
+                        return info.shutdownPromise.thenRun(connection::close);
                     });
            return new RpcState<>(this.bootstrapFactory, conn, onDisconnect);
         });
-        return state;
     }
 
     public void accept(VatNetwork.Connection<VatId> connection) {
diff --git a/runtime-rpc/src/test/java/org/capnproto/RpcStateTest.java b/runtime-rpc/src/test/java/org/capnproto/RpcStateTest.java
index 6a2f475..258f7da 100644
--- a/runtime-rpc/src/test/java/org/capnproto/RpcStateTest.java
+++ b/runtime-rpc/src/test/java/org/capnproto/RpcStateTest.java
@@ -83,11 +83,6 @@ public class RpcStateTest {
         this.connection = new TestConnection();
         this.bootstrapInterface = new Capability.Client(Capability.newNullCap());
         var bootstrapFactory = new BootstrapFactory<RpcTwoPartyProtocol.VatId.Reader>() {
-            @Override
-            public FromPointerReader<RpcTwoPartyProtocol.VatId.Reader> getVatIdFactory() {
-                return RpcTwoPartyProtocol.VatId.factory;
-            }
-
             @Override
             public Capability.Client createFor(RpcTwoPartyProtocol.VatId.Reader clientId) {
                 return bootstrapInterface;
diff --git a/runtime-rpc/src/test/java/org/capnproto/RpcTest.java b/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
index 66e8f92..f66a1e1 100644
--- a/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
+++ b/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
@@ -281,11 +281,6 @@ public class RpcTest {
     }
 
     static BootstrapFactory<Test.TestSturdyRef.Reader> bootstrapFactory = new BootstrapFactory<>() {
-        @Override
-        public FromPointerReader<Test.TestSturdyRef.Reader> getVatIdFactory() {
-            return Test.TestSturdyRef.factory;
-        }
-
         @Override
         public Capability.Client createFor(Test.TestSturdyRef.Reader refId) {
             var callCount = new Counter();
diff --git a/runtime/src/main/java/org/capnproto/BootstrapFactory.java b/runtime/src/main/java/org/capnproto/BootstrapFactory.java
index c6bd075..a3195d4 100644
--- a/runtime/src/main/java/org/capnproto/BootstrapFactory.java
+++ b/runtime/src/main/java/org/capnproto/BootstrapFactory.java
@@ -1,8 +1,5 @@
 package org.capnproto;
 
 public interface BootstrapFactory<VatId> {
-
-    FromPointerReader<VatId> getVatIdFactory();
-
     Capability.Client createFor(VatId clientId);
 }
\ No newline at end of file