diff --git a/keycard_wallet/src/python_path.rs b/keycard_wallet/src/python_path.rs
index 19822737..b98061eb 100644
--- a/keycard_wallet/src/python_path.rs
+++ b/keycard_wallet/src/python_path.rs
@@ -1,4 +1,5 @@
 use std::{env, path::PathBuf};
+
 use pyo3::{prelude::*, types::PyList};
 
 /// Adds the project's `python/` directory and venv site-packages to Python's sys.path.
@@ -25,11 +26,9 @@ pub fn add_python_path(py: Python<'_>) -> PyResult<()> {
         let path_str = path.to_str().expect("Invalid path");
 
         // Avoid duplicating the path
-        let already_present = sys_path.iter().any(|p| {
-            p.extract::<&str>()
-                .map(|s| s == path_str)
-                .unwrap_or(false)
-        });
+        let already_present = sys_path
+            .iter()
+            .any(|p| p.extract::<&str>().map(|s| s == path_str).unwrap_or(false));
 
         if !already_present {
             sys_path.insert(0, path_str)?;
diff --git a/wallet/src/cli/programs/token.rs b/wallet/src/cli/programs/token.rs
index 436b54a8..dae92e47 100644
--- a/wallet/src/cli/programs/token.rs
+++ b/wallet/src/cli/programs/token.rs
@@ -288,8 +288,6 @@ impl WalletSubcommand for TokenProgramAgnosticSubcommand {
                                         sender_account_id: from,
                                         recipient_account_id: to,
                                         balance_to_move: amount,
-                                        pin,
-                                        sender_key_path: from_key_path,
                                     },
                                 )
                             }
@@ -566,10 +564,6 @@ pub enum TokenProgramSubcommandPublic {
         recipient_account_id: String,
         #[arg(short, long)]
         balance_to_move: u128,
-        #[arg(long)]
-        pin: Option<String>,
-        #[arg(long)]
-        sender_key_path: Option<String>,
     },
     // Burn tokens using the token program
     BurnToken {
@@ -802,16 +796,12 @@ impl WalletSubcommand for TokenProgramSubcommandPublic {
                 sender_account_id,
                 recipient_account_id,
                 balance_to_move,
-                pin,
-                sender_key_path,
             } => {
                 Token(wallet_core)
                     .send_transfer_transaction(
                         sender_account_id.parse().unwrap(),
                         recipient_account_id.parse().unwrap(),
                         balance_to_move,
-                        pin,
-                        sender_key_path,
                     )
                     .await?;
                 Ok(SubcommandReturnValue::Empty)
diff --git a/wallet/src/program_facades/token.rs b/wallet/src/program_facades/token.rs
index 11ce98ab..1f941c8c 100644
--- a/wallet/src/program_facades/token.rs
+++ b/wallet/src/program_facades/token.rs
@@ -1,6 +1,5 @@
 use common::{HashType, transaction::NSSATransaction};
-use keycard_wallet::KeycardWallet;
-use nssa::{AccountId, program::Program, public_transaction::WitnessSet};
+use nssa::{AccountId, program::Program};
 use nssa_core::{NullifierPublicKey, SharedSecretKey, encryption::ViewingPublicKey};
 use sequencer_service_rpc::RpcClient as _;
 use token_core::Instruction;
@@ -154,8 +153,6 @@ impl Token<'_> {
         sender_account_id: AccountId,
         recipient_account_id: AccountId,
         amount: u128,
-        pin: Option<String>,
-        sender_key_path: Option<String>,
     ) -> Result<HashType, ExecutionFailureKind> {
         let account_ids = vec![sender_account_id, recipient_account_id];
         let program_id = nssa::program::Program::token().id();
@@ -167,12 +164,34 @@ impl Token<'_> {
             .get_accounts_nonces(vec![sender_account_id])
             .await
             .map_err(ExecutionFailureKind::SequencerError)?;
-        let recipient_nonces = self
+
+        let mut private_keys = Vec::new();
+        let sender_sk = self
             .0
-            .get_accounts_nonces(vec![recipient_account_id])
-            .await
-            .map_err(ExecutionFailureKind::SequencerError)?;
-        nonces.extend(recipient_nonces);
+            .storage
+            .user_data
+            .get_pub_account_signing_key(sender_account_id)
+            .ok_or(ExecutionFailureKind::KeyNotFoundError)?;
+        private_keys.push(sender_sk);
+
+        if let Some(recipient_sk) = self
+            .0
+            .storage
+            .user_data
+            .get_pub_account_signing_key(recipient_account_id)
+        {
+            private_keys.push(recipient_sk);
+            let recipient_nonces = self
+                .0
+                .get_accounts_nonces(vec![recipient_account_id])
+                .await
+                .map_err(ExecutionFailureKind::SequencerError)?;
+            nonces.extend(recipient_nonces);
+        } else {
+            println!(
+                "Receiver's account ({recipient_account_id}) private key not found in wallet. Proceeding with only sender's key."
+            );
+        }
 
         let message = nssa::public_transaction::Message::try_new(
             program_id,
@@ -181,44 +200,8 @@ impl Token<'_> {
             instruction,
         )
         .unwrap();
-
-        let witness_set = if let Some(pin) = &pin {
-            let sender_public_key = KeycardWallet::get_public_key_for_path_with_connect(
-                pin,
-                sender_key_path.as_ref().expect("Expect a key path String."),
-            );
-            let signature = KeycardWallet::sign_message_for_path_with_connect(
-                pin,
-                sender_key_path.as_ref().expect("Expect a key path String."),
-                &message.hash_message(),
-            )
-            .expect("Expect a valid signature");
-            WitnessSet::from_list(&[signature], &[sender_public_key])
-        } else {
-            let mut private_keys = Vec::new();
-            let sender_sk = self
-                .0
-                .storage
-                .user_data
-                .get_pub_account_signing_key(sender_account_id)
-                .ok_or(ExecutionFailureKind::KeyNotFoundError)?;
-            private_keys.push(sender_sk);
-
-            if let Some(recipient_sk) = self
-                .0
-                .storage
-                .user_data
-                .get_pub_account_signing_key(recipient_account_id)
-            {
-                private_keys.push(recipient_sk);
-            } else {
-                println!(
-                    "Receiver's account ({recipient_account_id}) private key not found in wallet. Proceeding with only sender's key."
-                );
-            }
-
-            nssa::public_transaction::WitnessSet::for_message(&message, &private_keys)
-        };
+        let witness_set =
+            nssa::public_transaction::WitnessSet::for_message(&message, &private_keys);
 
         let tx = nssa::PublicTransaction::new(message, witness_set);