diff --git a/src/drone.rs b/src/drone.rs
index a07c312972..4d94ccd60e 100644
--- a/src/drone.rs
+++ b/src/drone.rs
@@ -290,7 +290,6 @@ mod tests {
             bank,
             0,
             &[],
-            Some(Duration::from_millis(30)),
             leader,
             exit.clone(),
             &ledger_path,
diff --git a/src/fullnode.rs b/src/fullnode.rs
index 45a9bc0124..6f6653f359 100644
--- a/src/fullnode.rs
+++ b/src/fullnode.rs
@@ -14,7 +14,6 @@ use std::net::SocketAddr;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, RwLock};
 use std::thread::{JoinHandle, Result};
-use std::time::Duration;
 use tpu::Tpu;
 use tvu::Tvu;
 use untrusted::Input;
@@ -107,8 +106,6 @@ impl Fullnode {
                 bank,
                 entry_height,
                 &ledger_tail,
-                //Some(Duration::from_millis(1000)),
-                None,
                 node,
                 exit.clone(),
                 ledger_path,
@@ -185,12 +182,15 @@ impl Fullnode {
         bank: Bank,
         entry_height: u64,
         ledger_tail: &[Entry],
-        tick_duration: Option<Duration>,
         node: TestNode,
         exit: Arc<AtomicBool>,
         ledger_path: &str,
         sigverify_disabled: bool,
     ) -> Self {
+        let tick_duration = None;
+        // TODO: To light up PoH, uncomment the following line:
+        //let tick_duration = Some(Duration::from_millis(1000));
+
         let bank = Arc::new(bank);
         let mut thread_hdls = vec![];
         let rpu = Rpu::new(
diff --git a/src/thin_client.rs b/src/thin_client.rs
index 34efde13c1..01b5e5f565 100755
--- a/src/thin_client.rs
+++ b/src/thin_client.rs
@@ -361,7 +361,6 @@ mod tests {
             bank,
             0,
             &[],
-            Some(Duration::from_millis(30)),
             leader,
             exit.clone(),
             &ledger_path,
@@ -409,7 +408,6 @@ mod tests {
             bank,
             0,
             &[],
-            Some(Duration::from_millis(30)),
             leader,
             exit.clone(),
             &ledger_path,
@@ -469,7 +467,6 @@ mod tests {
             bank,
             0,
             &[],
-            Some(Duration::from_millis(30)),
             leader,
             exit.clone(),
             &ledger_path,