diff --git a/app/detekt-baseline.xml b/app/detekt-baseline.xml
index 056538f4c795a721307d04f599019d94219452e9..d8771b24fa30e89ba580dee8395dddddf5ddc234 100644
--- a/app/detekt-baseline.xml
+++ b/app/detekt-baseline.xml
@@ -224,22 +224,6 @@
NoMultipleSpaces:SearchViewModel.kt$SearchViewModel$
NoSemicolons:AgeRatingProvider.kt$AgeRatingProvider.UriCode.AgeRating$;
NoTrailingSpaces:DownloadInfoApiImpl.kt$DownloadInfoApiImpl$
- NoUnusedImports:AppLoungePackageManager.kt$foundation.e.apps.install.pkg.AppLoungePackageManager.kt
- NoUnusedImports:AppManagerImpl.kt$foundation.e.apps.data.install.AppManagerImpl.kt
- NoUnusedImports:AppManagerWrapper.kt$foundation.e.apps.data.install.AppManagerWrapper.kt
- NoUnusedImports:AppPurchaseFragment.kt$foundation.e.apps.ui.purchase.AppPurchaseFragment.kt
- NoUnusedImports:ApplicationDiffUtil.kt$foundation.e.apps.ui.applicationlist.ApplicationDiffUtil.kt
- NoUnusedImports:CleanApkAppsRepository.kt$foundation.e.apps.data.cleanapk.repositories.CleanApkAppsRepository.kt
- NoUnusedImports:CustomUncaughtExceptionHandler.kt$foundation.e.apps.utils.CustomUncaughtExceptionHandler.kt
- NoUnusedImports:DownloadManager.kt$foundation.e.apps.data.DownloadManager.kt
- NoUnusedImports:GoogleSignInFragment.kt$foundation.e.apps.ui.setup.signin.google.GoogleSignInFragment.kt
- NoUnusedImports:HomeApi.kt$foundation.e.apps.data.application.home.HomeApi.kt
- NoUnusedImports:HomeApiImpl.kt$foundation.e.apps.data.application.home.HomeApiImpl.kt
- NoUnusedImports:MainActivityViewModel.kt$foundation.e.apps.ui.MainActivityViewModel.kt
- NoUnusedImports:NotificationManagerModule.kt$foundation.e.apps.di.NotificationManagerModule.kt
- NoUnusedImports:PrivacyScoreRepositoryImpl.kt$foundation.e.apps.data.exodus.repositories.PrivacyScoreRepositoryImpl.kt
- NoUnusedImports:UpdatesFragment.kt$foundation.e.apps.ui.updates.UpdatesFragment.kt
- NoUnusedImports:UpdatesNotifier.kt$foundation.e.apps.install.updates.UpdatesNotifier.kt
NoWildcardImports:SystemAppsUpdatesRepository.kt$import foundation.e.apps.data.gitlab.UpdatableSystemAppsApi.*
PrintStackTrace:AppPrivacyInfoRepositoryImpl.kt$AppPrivacyInfoRepositoryImpl$e
PrintStackTrace:CommonUtilsModule.kt$CommonUtilsModule$e
diff --git a/app/src/main/java/foundation/e/apps/data/DownloadManager.kt b/app/src/main/java/foundation/e/apps/data/DownloadManager.kt
index 330e7ec0198536aeff75221fdffe866a965899f7..51705372e89537ec0ea7b7770637b9244ba1ed35 100644
--- a/app/src/main/java/foundation/e/apps/data/DownloadManager.kt
+++ b/app/src/main/java/foundation/e/apps/data/DownloadManager.kt
@@ -21,7 +21,6 @@ import android.app.DownloadManager
import android.content.Context
import android.database.Cursor
import android.net.Uri
-import android.os.Environment
import dagger.hilt.android.qualifiers.ApplicationContext
import foundation.e.apps.OpenForTesting
import foundation.e.apps.R
diff --git a/app/src/main/java/foundation/e/apps/data/application/home/HomeApi.kt b/app/src/main/java/foundation/e/apps/data/application/home/HomeApi.kt
index c32a1c1390e5a9a0d1a798b66a8647db29c33c14..51185eb28533ed777f285cb5b10b6a344d8782eb 100644
--- a/app/src/main/java/foundation/e/apps/data/application/home/HomeApi.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/home/HomeApi.kt
@@ -19,7 +19,6 @@
package foundation.e.apps.data.application.home
import androidx.lifecycle.LiveData
-import com.aurora.gplayapi.data.models.AuthData
import foundation.e.apps.data.ResultSupreme
import foundation.e.apps.data.application.data.Home
diff --git a/app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt
index 6bc4729703aab1aecf69486603035f8502295459..8cbd454d0f3a5e30f6794bf95028eccdd7182081 100644
--- a/app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt
@@ -24,7 +24,6 @@ import foundation.e.apps.data.ResultSupreme
import foundation.e.apps.data.Stores
import foundation.e.apps.data.application.ApplicationRepository
import foundation.e.apps.data.application.data.Home
-import foundation.e.apps.data.application.search.SearchRepository
import foundation.e.apps.data.enums.ResultStatus
import foundation.e.apps.data.enums.Source
import foundation.e.apps.data.handleNetworkResult
diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepository.kt
index 8745422db24b7cc5236766aec3a98aaef619b9c2..2ba0ebf1f94815b6b9fd60897ed53ba2a785cb05 100644
--- a/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepository.kt
@@ -21,7 +21,6 @@ package foundation.e.apps.data.cleanapk.repositories
import foundation.e.apps.data.application.ApplicationRepository
import foundation.e.apps.data.application.data.Application
import foundation.e.apps.data.application.data.Home
-import foundation.e.apps.data.application.search.SearchRepository
import foundation.e.apps.data.application.search.SearchSuggestion
import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher
import foundation.e.apps.data.cleanapk.CleanApkRetrofit
diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt
index 2a84fc5f9883f261e530e23690d4aa0c5a6cd9db..94a08f07d1f3f95ac76608ebb9f525d1ae7fad0b 100644
--- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt
@@ -20,7 +20,6 @@ package foundation.e.apps.data.exodus.repositories
import foundation.e.apps.data.application.data.Application
import foundation.e.apps.data.blockedApps.BlockedAppRepository
-import foundation.e.apps.di.CommonUtilsModule
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.math.ceil
diff --git a/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt
index 17651d4950c51bbeb181ee7b3c6de4b829a181b1..5bfb81e8b39d187d8d0331aaaa042a9aff5e5165 100644
--- a/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt
@@ -23,9 +23,7 @@ import android.app.NotificationChannel
import android.app.NotificationManager
import android.content.Context
import android.net.Uri
-import android.os.Build
import android.os.Environment
-import androidx.annotation.RequiresApi
import androidx.lifecycle.LiveData
import dagger.hilt.android.qualifiers.ApplicationContext
import foundation.e.apps.R
diff --git a/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt b/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt
index f17ebdec51f20a5ea835923c0060190052a54a3c..81d54847a999e76b8897d1e81b23b845572aea8c 100644
--- a/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt
+++ b/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt
@@ -1,8 +1,6 @@
package foundation.e.apps.data.install
import android.content.Context
-import android.os.Build
-import androidx.annotation.RequiresApi
import androidx.lifecycle.LiveData
import foundation.e.apps.OpenForTesting
import foundation.e.apps.data.Constants.MIN_VALID_RATING
diff --git a/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt b/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt
index fa13002d4e534794e51b81c07180020c49b162df..cfe68f818fec8c91f22dee5e9120e629fa3a2aa0 100644
--- a/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt
+++ b/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt
@@ -22,8 +22,6 @@ package foundation.e.apps.di
import android.app.NotificationChannel
import android.app.NotificationManager
import android.content.Context
-import android.os.Build
-import androidx.annotation.RequiresApi
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
diff --git a/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt b/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt
index aabd1c32c0df2e2dedb0cf5d1778eba68f69bc2b..75aa4ab9a065310514db04cbe66729f3cde839bb 100644
--- a/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt
+++ b/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt
@@ -32,7 +32,6 @@ import android.os.Build
import androidx.core.content.pm.PackageInfoCompat
import dagger.hilt.android.qualifiers.ApplicationContext
import foundation.e.apps.OpenForTesting
-import foundation.e.apps.data.application.search.SearchRepository
import foundation.e.apps.data.enums.Source
import foundation.e.apps.data.enums.Status
import foundation.e.apps.data.enums.Type
diff --git a/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt
index ba7fbb5c558111ace39c8ee84510ae20e61090db..74bd3eefe16059e19ad9fa74b6f130bf1072c4cd 100644
--- a/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt
+++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt
@@ -25,7 +25,6 @@ import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
-import android.os.Build
import androidx.core.app.ActivityCompat
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
index 520bf59e7bee0190a29748326ea7388aac6c069a..d4212a371bce31aec1b47a40acaef05ed18ab49b 100644
--- a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
@@ -34,7 +34,6 @@ import foundation.e.apps.data.application.ApplicationRepository
import foundation.e.apps.data.application.data.Application
import foundation.e.apps.data.blockedApps.BlockedAppRepository
import foundation.e.apps.data.ecloud.EcloudRepository
-import foundation.e.apps.data.enums.Source
import foundation.e.apps.data.enums.User
import foundation.e.apps.data.enums.isInitialized
import foundation.e.apps.data.enums.isUnFiltered
diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt
index aea640d79fa8e556d1f083facc251dddc70c6407..b2d87e9c35192104ee62f2480fe7fc92f92e66d9 100644
--- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt
+++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt
@@ -19,7 +19,6 @@ package foundation.e.apps.ui.applicationlist
import androidx.recyclerview.widget.DiffUtil
import foundation.e.apps.data.application.data.Application
-import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL
class ApplicationDiffUtil : DiffUtil.ItemCallback() {
override fun areItemsTheSame(oldItem: Application, newItem: Application): Boolean {
diff --git a/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt b/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt
index 218da4fcc27cccea61589809a73ae388f98864fe..3b27730bf8a9ba3fc98fa09ae3793bad786fabf4 100644
--- a/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt
@@ -1,7 +1,6 @@
package foundation.e.apps.ui.purchase
import android.annotation.SuppressLint
-import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt
index ae6f987d4dc46a79aa968ccd675a383fbedabe36..1bab86ff5ae3ae40205ee04c6239fff1ea13b996 100644
--- a/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt
@@ -19,7 +19,6 @@
package foundation.e.apps.ui.setup.signin.google
import android.annotation.SuppressLint
-import android.os.Build
import android.os.Bundle
import android.view.View
import android.webkit.CookieManager
diff --git a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt
index de4ca4a5f1c704270b0bab2999109ad5a6d126ea..f85576e1538e11daa53be3b6d8354cad6ac14eea 100644
--- a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt
@@ -63,7 +63,6 @@ import foundation.e.apps.utils.toast
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.launch
-import timber.log.Timber
import java.util.Locale
import javax.inject.Inject
diff --git a/app/src/main/java/foundation/e/apps/utils/CustomUncaughtExceptionHandler.kt b/app/src/main/java/foundation/e/apps/utils/CustomUncaughtExceptionHandler.kt
index 659d5f369a4b9c9911d349a3c02aceb175f64bf8..b6195783e1872702fcfc8a8699d32bcebbc2008e 100644
--- a/app/src/main/java/foundation/e/apps/utils/CustomUncaughtExceptionHandler.kt
+++ b/app/src/main/java/foundation/e/apps/utils/CustomUncaughtExceptionHandler.kt
@@ -25,7 +25,6 @@ import android.app.NotificationManager
import android.content.Context
import android.content.pm.PackageManager
import android.database.sqlite.SQLiteFullException
-import android.os.Build
import androidx.annotation.StringRes
import androidx.core.app.ActivityCompat
import androidx.core.app.NotificationCompat