diff --git a/data/src/main/java/one/nem/lacerta/data/impl/CommonsImpl.java b/data/src/main/java/one/nem/lacerta/data/impl/CommonsImpl.java
index 073e822f..ab3188ef 100644
--- a/data/src/main/java/one/nem/lacerta/data/impl/CommonsImpl.java
+++ b/data/src/main/java/one/nem/lacerta/data/impl/CommonsImpl.java
@@ -1,16 +1,12 @@
 package one.nem.lacerta.data.impl;
 
-import android.content.Context;
-
 import java.nio.file.Path;
-import java.util.Objects;
 
 import javax.inject.Inject;
 
-import dagger.hilt.android.qualifiers.ApplicationContext;
 import one.nem.lacerta.data.repository.Commons;
 
-import one.nem.lacerta.utils.repository.FileUtils;
+import one.nem.lacerta.utils.repository.DeviceInfoUtils;
 
 public class CommonsImpl implements Commons{
 
@@ -19,7 +15,7 @@ public class CommonsImpl implements Commons{
     }
 
     @Inject
-    FileUtils fileUtils;
+    DeviceInfoUtils fileUtils;
 
     public Path getExternalFilesDirPath(String type) {
         return fileUtils.getExternalFilesDirPath(type);
diff --git a/data/src/main/java/one/nem/lacerta/data/impl/DebugFuncImpl.java b/data/src/main/java/one/nem/lacerta/data/impl/DebugFuncImpl.java
index 1804ad74..6c762747 100644
--- a/data/src/main/java/one/nem/lacerta/data/impl/DebugFuncImpl.java
+++ b/data/src/main/java/one/nem/lacerta/data/impl/DebugFuncImpl.java
@@ -6,7 +6,6 @@ import javax.inject.Inject;
 
 import one.nem.lacerta.data.repository.DebugFunc;
 import one.nem.lacerta.source.jgit.RepoUtils;
-import one.nem.lacerta.utils.repository.FileUtils;
 
 public class DebugFuncImpl implements DebugFunc {