diff --git a/key_protocol/src/key_management/ephemeral_key_holder.rs b/key_protocol/src/key_management/ephemeral_key_holder.rs
index 55120a6..108a41e 100644
--- a/key_protocol/src/key_management/ephemeral_key_holder.rs
+++ b/key_protocol/src/key_management/ephemeral_key_holder.rs
@@ -1,11 +1,7 @@
-use aes_gcm::{AeadCore, Aes256Gcm, KeyInit, aead::Aead};
 use elliptic_curve::PrimeField;
-use elliptic_curve::point::AffineCoordinates;
-use k256::{AffinePoint, FieldBytes, Scalar};
+use k256::{AffinePoint, Scalar};
 use log::info;
-use rand::{RngCore, rngs::OsRng};
-
-use super::constants_types::{CipherText, Nonce};
+use sha2::Digest;
 
 #[derive(Debug)]
 ///Ephemeral secret key holder. Non-clonable as intended for one-time use. Produces ephemeral public keys. Can produce shared secret for sender.
diff --git a/key_protocol/src/key_protocol_core/mod.rs b/key_protocol/src/key_protocol_core/mod.rs
index 44d8ff6..167f8fe 100644
--- a/key_protocol/src/key_protocol_core/mod.rs
+++ b/key_protocol/src/key_protocol_core/mod.rs
@@ -11,7 +11,7 @@ pub type PublicKey = AffinePoint;
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct NSSAUserData {
     ///Map for all user public accounts
-    pub_account_signing_keys: HashMap<nssa::Address, nssa::PrivateKey>,
+    pub pub_account_signing_keys: HashMap<nssa::Address, nssa::PrivateKey>,
     ///Map for all user private accounts
     user_private_accounts: HashMap<nssa::Address, KeyChain>,
 }
diff --git a/wallet/src/chain_storage/mod.rs b/wallet/src/chain_storage/mod.rs
index e08650c..9a6bd59 100644
--- a/wallet/src/chain_storage/mod.rs
+++ b/wallet/src/chain_storage/mod.rs
@@ -32,7 +32,6 @@ impl WalletChainStore {
 
     pub(crate) fn insert_account_data(&mut self, acc_data: PersistentAccountData) {
         self.user_data
-            .key_holder
             .pub_account_signing_keys
             .insert(acc_data.address, acc_data.pub_sign_key);
     }
diff --git a/wallet/src/helperfunctions.rs b/wallet/src/helperfunctions.rs
index 8a7b7b6..45bb5f0 100644
--- a/wallet/src/helperfunctions.rs
+++ b/wallet/src/helperfunctions.rs
@@ -53,7 +53,7 @@ pub fn fetch_persistent_accounts() -> Result<Vec<PersistentAccountData>> {
 pub fn produce_data_for_storage(user_data: &NSSAUserData) -> Vec<PersistentAccountData> {
     let mut vec_for_storage = vec![];
 
-    for (addr, key) in &user_data.key_holder.pub_account_signing_keys {
+    for (addr, key) in &user_data.pub_account_signing_keys {
         vec_for_storage.push(PersistentAccountData {
             address: *addr,
             pub_sign_key: key.clone(),
diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs
index a52b1c6..f9c5f24 100644
--- a/wallet/src/lib.rs
+++ b/wallet/src/lib.rs
@@ -111,7 +111,7 @@ impl WalletCore {
             )
             .unwrap();
 
-            let signing_key = self.storage.user_data.get_account_signing_key(&from);
+            let signing_key = self.storage.user_data.get_pub_account_signing_key(&from);
 
             let Some(signing_key) = signing_key else {
                 return Err(ExecutionFailureKind::KeyNotFoundError);
@@ -228,7 +228,7 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
         Command::RegisterAccount {} => {
             let addr = wallet_core.create_new_account();
 
-            let key = wallet_core.storage.user_data.get_account_signing_key(&addr);
+            let key = wallet_core.storage.user_data.get_pub_account_signing_key(&addr);
 
             info!("Generated new account with addr {addr:#?}");
             info!("With key {key:#?}");