Revert "Add misc changes"

This reverts commit 86c3bcd361.

common/eth2/src/lighthouse_vc/http_client.rs

@@ -487,7 +487,7 @@ impl ValidatorClientHttpClient {
         .await
     }
 
-    /// `DELETE lighthouse/keystores`
+    /// `DELETE eth/v1/keystores`
     pub async fn delete_lighthouse_keystores(
         &self,
         req: &DeleteKeystoresRequest,

validator_manager/src/move_validators.rs

@@ -31,7 +31,6 @@ pub const VALIDATORS_FLAG: &str = "validators";
 pub const GAS_LIMIT_FLAG: &str = "gas-limit";
 pub const FEE_RECIPIENT_FLAG: &str = "suggested-fee-recipient";
 pub const BUILDER_PROPOSALS_FLAG: &str = "builder-proposals";
-pub const SKIP_WARNING_PROMPTS: &str = "skip-warning-prompts";
 
 const NO_VALIDATORS_MSG: &str = "No validators present on source validator client";
 
@@ -129,17 +128,6 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                 .possible_values(&["true", "false"])
                 .takes_value(true),
         )
-        .arg(
-            Arg::with_name(SKIP_WARNING_PROMPTS)
-                .long(SKIP_WARNING_PROMPTS)
-                .help(
-                    "Don't display interactive warning prompts. Only provide \
-                    this flag if you know what the prompts say and you know \
-                    what you're doing.",
-                )
-                .required(false)
-                .takes_value(false),
-        )
 }
 
 #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
@@ -179,7 +167,6 @@ pub struct MoveConfig {
     pub builder_proposals: Option<bool>,
     pub fee_recipient: Option<Address>,
     pub gas_limit: Option<u64>,
-    pub skip_warning_prompts: bool,
 }
 
 impl MoveConfig {
@@ -193,7 +180,6 @@ impl MoveConfig {
             builder_proposals: clap_utils::parse_optional(matches, BUILDER_PROPOSALS_FLAG)?,
             fee_recipient: clap_utils::parse_optional(matches, FEE_RECIPIENT_FLAG)?,
             gas_limit: clap_utils::parse_optional(matches, GAS_LIMIT_FLAG)?,
-            skip_warning_prompts: matches.is_present(SKIP_WARNING_PROMPTS),
         })
     }
 }
@@ -220,7 +206,6 @@ async fn run<'a>(config: MoveConfig) -> Result<(), String> {
         builder_proposals,
         fee_recipient,
         gas_limit,
-        skip_warning_prompts
     } = config;
 
     // Moving validators between the same VC is unlikely to be useful and probably indicates a user