diff --git a/contracts/babylon/src/contract.rs b/contracts/babylon/src/contract.rs
index 183c85b..fc1aedf 100644
--- a/contracts/babylon/src/contract.rs
+++ b/contracts/babylon/src/contract.rs
@@ -290,10 +290,6 @@ mod tests {
             btc_confirmation_depth: 10,
             checkpoint_finalization_timeout: 100,
             notify_cosmos_zone: false,
-            btc_staking_code_id: None,
-            btc_staking_msg: None,
-            btc_finality_code_id: Some(2),
-            btc_finality_msg: None,
             admin: None,
             consumer_name: None,
             consumer_description: None,
@@ -326,10 +322,6 @@ mod tests {
             btc_confirmation_depth: 10,
             checkpoint_finalization_timeout: 100,
             notify_cosmos_zone: false,
-            btc_staking_code_id: None,
-            btc_staking_msg: None,
-            btc_finality_code_id: Some(2),
-            btc_finality_msg: Some(Binary::from(params.as_bytes())),
             admin: None,
             consumer_name: None,
             consumer_description: None,
diff --git a/contracts/babylon/src/msg/contract.rs b/contracts/babylon/src/msg/contract.rs
index 75b72a7..b79c312 100644
--- a/contracts/babylon/src/msg/contract.rs
+++ b/contracts/babylon/src/msg/contract.rs
@@ -56,25 +56,6 @@ impl ContractMsg for InstantiateMsg {
         }
         let _ = self.babylon_tag_to_bytes()?;
 
-        if self.btc_staking_code_id.is_some() {
-            if let (Some(consumer_name), Some(consumer_description)) =
-                (&self.consumer_name, &self.consumer_description)
-            {
-                if consumer_name.trim().is_empty() {
-                    return Err(StdError::generic_err("Consumer name cannot be empty"));
-                }
-                if consumer_description.trim().is_empty() {
-                    return Err(StdError::generic_err(
-                        "Consumer description cannot be empty",
-                    ));
-                }
-            } else {
-                return Err(StdError::generic_err(
-                    "Consumer name and description are required when btc_staking_code_id is set",
-                ));
-            }
-        }
-
         if let Some(transfer_info) = &self.transfer_info {
             transfer_info.validate()?;
         }
diff --git a/contracts/babylon/src/multitest/suite.rs b/contracts/babylon/src/multitest/suite.rs
index ba46ec0..1c02910 100644
--- a/contracts/babylon/src/multitest/suite.rs
+++ b/contracts/babylon/src/multitest/suite.rs
@@ -108,10 +108,6 @@ impl SuiteBuilder {
                     btc_confirmation_depth: 1,
                     checkpoint_finalization_timeout: 10,
                     notify_cosmos_zone: false,
-                    btc_staking_code_id: Some(btc_staking_code_id),
-                    btc_staking_msg: staking_msg,
-                    btc_finality_code_id: Some(btc_finality_code_id),
-                    btc_finality_msg: finality_msg,
                     admin: Some(owner.to_string()),
                     consumer_name: Some("TestConsumer".to_string()),
                     consumer_description: Some("Test Consumer Description".to_string()),
diff --git a/contracts/btc-finality/src/contract.rs b/contracts/btc-finality/src/contract.rs
index b07d63a..3772089 100644
--- a/contracts/btc-finality/src/contract.rs
+++ b/contracts/btc-finality/src/contract.rs
@@ -318,7 +318,7 @@ fn send_rewards_msg(
     Ok(wasm_msg)
 }
 
-pub fn get_activated_height(staking_addr: &Addr, querier: &QuerierWrapper) -> StdResult<u64> {
+pub fn get_activated_height(querier: &QuerierWrapper) -> StdResult<u64> {
     // TODO: Use a raw query
     let query = encode_smart_query(
         &params.btc_staking_contract_address,