diff --git a/validator_client/src/duties/mod.rs b/validator_client/src/duties/mod.rs
index de08f6ce7..569a99efa 100644
--- a/validator_client/src/duties/mod.rs
+++ b/validator_client/src/duties/mod.rs
@@ -51,7 +51,11 @@ impl<U: BeaconNode> DutiesManager<U> {
     ///
     /// be a wall-clock (e.g., system time, remote server time, etc.).
     fn update(&self, epoch: Epoch) -> Result<UpdateOutcome, Error> {
+<<<<<<< HEAD
         let duties = self.beacon_node.request_duties(epoch, &self.signers)?;
+=======
+        let duties = self.beacon_node.request_duties(epoch, &self.pubkeys)?;
+>>>>>>> master
         {
             // If these duties were known, check to see if they're updates or identical.
             if let Some(known_duties) = self.duties_map.read()?.get(&epoch) {
diff --git a/validator_client/src/service.rs b/validator_client/src/service.rs
index 36da36a1f..b74fe4d73 100644
--- a/validator_client/src/service.rs
+++ b/validator_client/src/service.rs
@@ -205,7 +205,6 @@ impl Service {
             None => panic!("No key pairs found, cannot start validator client without. Try running ./account_manager generate first.")
         };
         */
-
         let keypairs = Arc::new(generate_deterministic_keypairs(8));
 
         /* build requisite objects to pass to core thread */
@@ -294,36 +293,6 @@ impl Service {
 
     /*
 
-    for keypair in keypairs {
-        info!(self.log, "Starting validator services"; "validator" => keypair.pk.concatenated_hex_id());
-
-        // Spawn a new thread to maintain the validator's `EpochDuties`.
-        let duties_manager_thread = {
-            let spec = spec.clone();
-            let duties_map = duties_map.clone();
-            let slot_clock = self.slot_clock.clone();
-            let log = self.log.clone();
-            let beacon_node = self.validator_client.clone();
-            let pubkey = keypair.pk.clone();
-            thread::spawn(move || {
-                let manager = DutiesManager {
-                    duties_map,
-                    pubkey,
-                    spec,
-                    slot_clock,
-                    beacon_node,
-                };
-                let mut duties_manager_service = DutiesManagerService {
-                    manager,
-                    poll_interval_millis,
-                    log,
-                };
-
-                duties_manager_service.run();
-            })
-        };
-
-        let mut threads = vec![];
 
         for keypair in keypairs {
             info!(log, "Starting validator services"; "validator" => keypair.pk.concatenated_hex_id());