diff --git a/monkey/monkey_island/cc/server_utils/encryption/__init__.py b/monkey/monkey_island/cc/server_utils/encryption/__init__.py
index ea04a25e1..109423634 100644
--- a/monkey/monkey_island/cc/server_utils/encryption/__init__.py
+++ b/monkey/monkey_island/cc/server_utils/encryption/__init__.py
@@ -11,7 +11,11 @@ from monkey_island.cc.server_utils.encryption.encryptors.password_based_bytes_en
     InvalidCredentialsError,
     InvalidCiphertextError,
 )
-from .data_store_encryptor import initialize_datastore_encryptor, get_datastore_encryptor
+from .data_store_encryptor import (
+    initialize_datastore_encryptor,
+    get_datastore_encryptor,
+    remove_old_datastore_key,
+)
 from .dict_encryption.dict_encryptor import (
     SensitiveField,
     encrypt_dict,
diff --git a/monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py b/monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py
index 6ac0a23ad..f7add80f3 100644
--- a/monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py
+++ b/monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py
@@ -3,8 +3,9 @@ from typing import Union
 
 from Crypto import Random  # noqa: DUO133  # nosec: B413
 
-from monkey_island.cc.server_utils.encryption import IEncryptor, KeyBasedEncryptor
-from monkey_island.cc.server_utils.encryption.encryptors.password_based_bytes_encryption import (
+from monkey_island.cc.server_utils.encryption import (
+    IEncryptor,
+    KeyBasedEncryptor,
     PasswordBasedBytesEncryptor,
 )
 from monkey_island.cc.server_utils.file_utils import open_new_securely_permissioned_file
diff --git a/monkey/monkey_island/cc/services/authentication.py b/monkey/monkey_island/cc/services/authentication.py
index ac5400bfd..9d3d3baa7 100644
--- a/monkey/monkey_island/cc/services/authentication.py
+++ b/monkey/monkey_island/cc/services/authentication.py
@@ -1,8 +1,8 @@
 from monkey_island.cc.server_utils.encryption import (
     get_datastore_encryptor,
     initialize_datastore_encryptor,
+    remove_old_datastore_key,
 )
-from monkey_island.cc.server_utils.encryption.data_store_encryptor import remove_old_datastore_key
 
 
 class AuthenticationService: