diff --git a/account_manager/src/validator/create.rs b/account_manager/src/validator/create.rs
index 863cbf1c054..a779a2881d4 100644
--- a/account_manager/src/validator/create.rs
+++ b/account_manager/src/validator/create.rs
@@ -140,6 +140,7 @@ pub fn cli_run<T: EthSpec>(
     ensure_dir_exists(&validator_dir)?;
     ensure_dir_exists(&secrets_dir)?;
 
+    eprintln!("validator-dir path: {:?}", validator_dir);
     eprintln!("secrets-dir path {:?}", secrets_dir);
     eprintln!("wallets-dir path {:?}", wallet_base_dir);
 
diff --git a/account_manager/src/validator/import.rs b/account_manager/src/validator/import.rs
index 8b4a216e857..09459c578f2 100644
--- a/account_manager/src/validator/import.rs
+++ b/account_manager/src/validator/import.rs
@@ -86,6 +86,7 @@ pub fn cli_run(matches: &ArgMatches, validator_dir: PathBuf) -> Result<(), Strin
             )
         })?;
 
+    eprintln!("validator-dir path: {:?}", validator_dir);
     // Collect the paths for the keystores that should be imported.
     let keystore_paths = match (keystore, keystores_dir) {
         (Some(keystore), None) => vec![keystore],
diff --git a/account_manager/src/validator/list.rs b/account_manager/src/validator/list.rs
index dd97de156da..600fa420f63 100644
--- a/account_manager/src/validator/list.rs
+++ b/account_manager/src/validator/list.rs
@@ -10,6 +10,7 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
 }
 
 pub fn cli_run(validator_dir: PathBuf) -> Result<(), String> {
+    eprintln!("validator-dir path: {:?}", validator_dir);
     let mgr = ValidatorManager::open(&validator_dir)
         .map_err(|e| format!("Unable to read --{}: {:?}", VALIDATOR_DIR_FLAG, e))?;
 
diff --git a/account_manager/src/validator/recover.rs b/account_manager/src/validator/recover.rs
index ecea0efbdd0..b595cc64022 100644
--- a/account_manager/src/validator/recover.rs
+++ b/account_manager/src/validator/recover.rs
@@ -88,6 +88,9 @@ pub fn cli_run(matches: &ArgMatches, validator_dir: PathBuf) -> Result<(), Strin
     let mnemonic_path: Option<PathBuf> = clap_utils::parse_optional(matches, MNEMONIC_FLAG)?;
     let stdin_inputs = matches.is_present(STDIN_INPUTS_FLAG);
 
+    eprintln!("validator-dir path: {:?}", validator_dir);
+    eprintln!("secrets-dir path: {:?}", secrets_dir);
+
     ensure_dir_exists(&validator_dir)?;
     ensure_dir_exists(&secrets_dir)?;
 
diff --git a/account_manager/src/validator/slashing_protection.rs b/account_manager/src/validator/slashing_protection.rs
index 53a7edd513e..c376c4f4d33 100644
--- a/account_manager/src/validator/slashing_protection.rs
+++ b/account_manager/src/validator/slashing_protection.rs
@@ -44,6 +44,7 @@ pub fn cli_run<T: EthSpec>(
     env: Environment<T>,
     validator_base_dir: PathBuf,
 ) -> Result<(), String> {
+    eprintln!("validator-dir path: {:?}", validator_base_dir);
     let slashing_protection_db_path = validator_base_dir.join(SLASHING_PROTECTION_FILENAME);
 
     let genesis_validators_root = env
diff --git a/book/src/voluntary-exit.md b/book/src/voluntary-exit.md
index 6c0d634c18a..7fc9da0765d 100644
--- a/book/src/voluntary-exit.md
+++ b/book/src/voluntary-exit.md
@@ -23,19 +23,12 @@ To understand the phased rollout strategy for Eth2, please visit <https://ethere
 
 In order to initiate an exit, users can use the `lighthouse account validator exit` command.
 
-The `--validator` flag is used to specify the validator for which the user wants to initiate an exit transaction.
+The `--keystore` flag is used to specify the path to the EIP-2335 voting keystore for the validator.
 
 The `--beacon-node` flag is used to specify a beacon chain HTTP endpoint that confirms to the [Eth2.0 Standard API](https://ethereum.github.io/eth2.0-APIs/) specifications. That beacon node will be used to validate and propagate the voluntary exit. The default value for this flag is `http://localhost:5052`.
 
 The `--testnet` flag is used to specify a particular testnet (default is `medalla`).
 
-The `exit` command will search for the provided validator in the `validators-dir` (default `~/.lighthouse/{testnet}/validators`) directory and for the validator's password file in `secrets-dir` (default `  ~/.lighthouse/{testnet}/secrets`).
-
-If the corresponding password file is not found in the `secrets-dir`, the user will be prompted for a password on the terminal.
-
-[//]: # (Word this better or remove datadir part entirely)
-Alternately, users can specify custom directories using  `--validator-dir` and `--secrets-dir` flags or a custom parent directory using `--datadir`.
-
 After validating the password, the user will be prompted to enter a special exit phrase as a final confirmation after which the voluntary exit will be published to the beacon chain.
 
 The exit phrase is the following:
@@ -43,10 +36,10 @@ The exit phrase is the following:
 
 
 
-Below is an example for initiating a voluntary exit for validator `0xabcd` on the zinken testnet.
+Below is an example for initiating a voluntary exit on the zinken testnet.
 
 ```
-$ lighthouse --testnet zinken account validator exit --validator 0xabcd --beacon-node http://localhost:5052
+$ lighthouse --testnet zinken account validator exit --keystore /path/to/keystore --beacon-node http://localhost:5052
 
 Running account manager for zinken testnet
 validator-dir path: ~/.lighthouse/zinken/validators