diff --git a/src/bin/testnode.rs b/src/bin/testnode.rs
index 0eb38e195..4df3e67ca 100644
--- a/src/bin/testnode.rs
+++ b/src/bin/testnode.rs
@@ -130,8 +130,7 @@ fn main() {
         serve_sock.local_addr().unwrap(),
     );
     eprintln!("starting server...");
-    let threads = Tpu::serve(
-        &tpu,
+    let threads = tpu.serve(
         d,
         serve_sock,
         events_sock,
diff --git a/src/thin_client.rs b/src/thin_client.rs
index 852338f7c..ce5135cad 100644
--- a/src/thin_client.rs
+++ b/src/thin_client.rs
@@ -191,8 +191,8 @@ mod tests {
         let exit = Arc::new(AtomicBool::new(false));
         let accounting_stage = AccountingStage::new(accountant, &alice.last_id(), Some(30));
         let tpu = Arc::new(Tpu::new(accounting_stage));
-        let threads =
-            Tpu::serve(&tpu, d, serve, events_socket, gossip, exit.clone(), sink()).unwrap();
+        let threads = tpu.serve(d, serve, events_socket, gossip, exit.clone(), sink())
+            .unwrap();
         sleep(Duration::from_millis(300));
 
         let requests_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
diff --git a/src/tpu.rs b/src/tpu.rs
index b45087ad0..4f2ae287a 100644
--- a/src/tpu.rs
+++ b/src/tpu.rs
@@ -74,7 +74,7 @@ impl Tpu {
     /// This service is the network leader
     /// Set `exit` to shutdown its threads.
     pub fn serve<W: Write + Send + 'static>(
-        obj: &SharedTpu,
+        &self,
         me: ReplicatedData,
         requests_socket: UdpSocket,
         _events_socket: UdpSocket,
@@ -103,8 +103,8 @@ impl Tpu {
 
         let blob_recycler = packet::BlobRecycler::default();
         let thin_client_service = ThinClientService::new(
-            obj.request_processor.clone(),
-            obj.accounting_stage.clone(),
+            self.request_processor.clone(),
+            self.accounting_stage.clone(),
             exit.clone(),
             sig_verify_stage.output,
             packet_recycler.clone(),
@@ -113,8 +113,8 @@ impl Tpu {
 
         let (broadcast_sender, broadcast_receiver) = channel();
         let t_write = Self::write_service(
-            obj.accounting_stage.clone(),
-            obj.request_processor.clone(),
+            self.accounting_stage.clone(),
+            self.request_processor.clone(),
             exit.clone(),
             broadcast_sender,
             blob_recycler.clone(),