diff --git a/accounts/src/account_core/mod.rs b/accounts/src/account_core/mod.rs
index 813f6fc..d5f5e90 100644
--- a/accounts/src/account_core/mod.rs
+++ b/accounts/src/account_core/mod.rs
@@ -116,9 +116,6 @@ impl Account {
         asset: Asset,
         amount: u128,
         privacy_flag: bool,
-        utxo_id: u64,
-        tx_id: u64,
-        block_id: u64,
     ) -> Result<()> {
         let payload_with_asset = UTXOPayload {
             owner: self.address,
@@ -169,24 +166,14 @@ mod tests {
         UTXONullifier::default()
     }
 
-    fn generate_dummy_utxo(
-        address: TreeHashType,
-        amount: u128,
-        utxo_id: u64,
-    ) -> anyhow::Result<UTXOTreeInput> {
+    fn generate_dummy_utxo(address: TreeHashType, amount: u128) -> anyhow::Result<UTXO> {
         let payload = UTXOPayload {
             owner: address,
             asset: vec![],
             amount,
             privacy_flag: false,
         };
-        let utxo = UTXO::create_utxo_from_payload(payload);
-        utxo.map(|utxo| UTXOTreeInput {
-            utxo_id,
-            tx_id: 1,
-            block_id: 1,
-            utxo,
-        })
+        UTXO::create_utxo_from_payload(payload)
     }
 
     #[test]
@@ -200,7 +187,7 @@ mod tests {
     #[test]
     fn test_mark_spent_utxo() {
         let mut account = Account::new();
-        let utxo = generate_dummy_utxo(account.address, 100, 1).unwrap();
+        let utxo = generate_dummy_utxo(account.address, 100).unwrap();
         account.add_new_utxo_outputs(vec![utxo]).unwrap();
 
         let mut utxo_nullifier_map = HashMap::new();
@@ -214,8 +201,8 @@ mod tests {
     #[test]
     fn test_add_new_utxo_outputs() {
         let mut account = Account::new();
-        let utxo1 = generate_dummy_utxo(account.address, 100, 1).unwrap();
-        let utxo2 = generate_dummy_utxo(account.address, 200, 2).unwrap();
+        let utxo1 = generate_dummy_utxo(account.address, 100).unwrap();
+        let utxo2 = generate_dummy_utxo(account.address, 200).unwrap();
 
         let result = account.add_new_utxo_outputs(vec![utxo1.clone(), utxo2.clone()]);
 
@@ -237,7 +224,7 @@ mod tests {
         let asset = "dummy_asset";
         let amount = 1000u128;
 
-        let result = account.add_asset(asset, amount, false, 1, 1, 1);
+        let result = account.add_asset(asset, amount, false);
 
         assert!(result.is_ok());
         assert_eq!(account.utxos.len(), 1);
diff --git a/node_core/src/chain_storage/mod.rs b/node_core/src/chain_storage/mod.rs
index c4eef13..90c9cb1 100644
--- a/node_core/src/chain_storage/mod.rs
+++ b/node_core/src/chain_storage/mod.rs
@@ -15,7 +15,7 @@ use common::{
 };
 use k256::AffinePoint;
 use public_context::PublicSCContext;
-use utxo::{utxo_core::UTXO, utxo_tree::UTXOTreeInput};
+use utxo::utxo_core::UTXO;
 
 use crate::ActionData;
 
@@ -115,9 +115,7 @@ impl NodeChainStore {
                 let ephemeral_public_key_sender =
                     serde_json::from_slice::<AffinePoint>(&tx.ephemeral_pub_key)?;
 
-                for (utxo_id, (ciphertext, nonce, tag)) in
-                    tx.encoded_data.clone().into_iter().enumerate()
-                {
+                for (ciphertext, nonce, tag) in tx.encoded_data.clone() {
                     let slice = nonce.as_slice();
                     let nonce =
                         accounts::key_management::constants_types::Nonce::clone_from_slice(slice);