diff --git a/control_plane/src/compute.rs b/control_plane/src/compute.rs
index 7b84fbc3b8..1df7249361 100644
--- a/control_plane/src/compute.rs
+++ b/control_plane/src/compute.rs
@@ -73,15 +73,6 @@ impl ComputeControlPlane {
             .unwrap_or(self.base_port)
     }
 
-    pub fn local(local_env: &LocalEnv, pageserver: &Arc<PageServerNode>) -> ComputeControlPlane {
-        ComputeControlPlane {
-            base_port: 65431,
-            pageserver: Arc::clone(pageserver),
-            nodes: BTreeMap::new(),
-            env: local_env.clone(),
-        }
-    }
-
     // FIXME: see also parse_point_in_time in branches.rs.
     fn parse_point_in_time(
         &self,
diff --git a/control_plane/src/storage.rs b/control_plane/src/storage.rs
index 5dee6deaba..e89620555b 100644
--- a/control_plane/src/storage.rs
+++ b/control_plane/src/storage.rs
@@ -63,7 +63,6 @@ impl ResponseErrorMessageExt for Response {
 //
 #[derive(Debug)]
 pub struct PageServerNode {
-    pub kill_on_exit: bool,
     pub pg_connection_config: Config,
     pub env: LocalEnv,
     pub http_client: Client,
@@ -79,7 +78,6 @@ impl PageServerNode {
         };
 
         PageServerNode {
-            kill_on_exit: false,
             pg_connection_config: Self::pageserver_connection_config(
                 password,
                 env.pageserver_pg_port,
@@ -333,12 +331,3 @@ impl PageServerNode {
             .json()?)
     }
 }
-
-impl Drop for PageServerNode {
-    fn drop(&mut self) {
-        // TODO Looks like this flag is never set
-        if self.kill_on_exit {
-            let _ = self.stop(true);
-        }
-    }
-}