diff --git a/src/drone.rs b/src/drone.rs
index ce5a69cb6f..be1d3ea3ae 100644
--- a/src/drone.rs
+++ b/src/drone.rs
@@ -262,16 +262,7 @@ mod tests {
     fn tmp_ledger_path(name: &str) -> String {
         let keypair = KeyPair::new();
 
-        let id = {
-            let ids: Vec<_> = keypair
-                .pubkey()
-                .iter()
-                .map(|id| format!("{}", id))
-                .collect();
-            ids.join("")
-        };
-
-        format!("farf/{}-{}", name, id)
+        format!("farf/{}-{}", name, keypair.pubkey())
     }
 
     #[test]
diff --git a/src/fullnode.rs b/src/fullnode.rs
index fe45f68147..e046cb3c87 100644
--- a/src/fullnode.rs
+++ b/src/fullnode.rs
@@ -384,16 +384,7 @@ mod tests {
     fn tmp_ledger_path(name: &str) -> String {
         let keypair = KeyPair::new();
 
-        let id = {
-            let ids: Vec<_> = keypair
-                .pubkey()
-                .iter()
-                .map(|id| format!("{}", id))
-                .collect();
-            ids.join("")
-        };
-
-        format!("farf/{}-{}", name, id)
+        format!("farf/{}-{}", name, keypair.pubkey())
     }
 
     #[test]
diff --git a/src/ledger.rs b/src/ledger.rs
index 10ad25d120..abd63a182c 100644
--- a/src/ledger.rs
+++ b/src/ledger.rs
@@ -39,10 +39,6 @@ fn entry_at(file: &mut File, at: u64) -> io::Result<Entry> {
     deserialize_from(file.take(len)).map_err(err_bincode_to_io)
 }
 
-//fn next_offset(file: &mut File) -> io::Result<u64> {
-//    deserialize_from(file.take(SIZEOF_U64)).map_err(err_bincode_to_io)
-//}
-
 fn next_entry(file: &mut File) -> io::Result<Entry> {
     let len = deserialize_from(file.take(SIZEOF_USIZE)).map_err(err_bincode_to_io)?;
     deserialize_from(file.take(len)).map_err(err_bincode_to_io)
@@ -441,8 +437,6 @@ mod tests {
         assert!(entries0.verify(&id));
     }
 
-    fn tmp_ledger_path() -> String {}
-
     #[test]
     fn test_ledger_reader_writer() {
         let ledger_path = tmp_ledger_path("test_ledger_reader_writer");
diff --git a/src/thin_client.rs b/src/thin_client.rs
index df2bf47493..d5bee03b75 100644
--- a/src/thin_client.rs
+++ b/src/thin_client.rs
@@ -297,16 +297,7 @@ mod tests {
     fn tmp_ledger_path(name: &str) -> String {
         let keypair = KeyPair::new();
 
-        let id = {
-            let ids: Vec<_> = keypair
-                .pubkey()
-                .iter()
-                .map(|id| format!("{}", id))
-                .collect();
-            ids.join("")
-        };
-
-        format!("farf/{}-{}", name, id)
+        format!("farf/{}-{}", name, keypair.pubkey())
     }
 
     #[test]
diff --git a/src/tvu.rs b/src/tvu.rs
index a3e96d631f..a2cb8869ef 100644
--- a/src/tvu.rs
+++ b/src/tvu.rs
@@ -177,16 +177,7 @@ pub mod tests {
     fn tmp_ledger_path(name: &str) -> String {
         let keypair = KeyPair::new();
 
-        let id = {
-            let ids: Vec<_> = keypair
-                .pubkey()
-                .iter()
-                .map(|id| format!("{}", id))
-                .collect();
-            ids.join("")
-        };
-
-        format!("farf/{}-{}", name, id)
+        format!("farf/{}-{}", name, keypair.pubkey())
     }
 
     /// Test that message sent from leader to target1 and replicated to target2