diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt
index 3c141bfb..106756fe 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt
@@ -12,7 +12,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.AsyncDifferConfig
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt
index 0450839a..02cb39b7 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt
@@ -21,7 +21,6 @@ import com.deniscerri.ytdlnis.work.DownloadWorker
 import com.google.gson.Gson
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.util.concurrent.TimeUnit
 
 class DownloadViewModel(application: Application) : AndroidViewModel(application) {
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt
index 7227292e..684ce99c 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt
@@ -11,7 +11,6 @@ import android.content.res.Configuration
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Build
-import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.provider.Settings
 import android.view.Window
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/service/DownloadInfo.kt b/app/src/main/java/com/deniscerri/ytdlnis/service/DownloadInfo.kt
deleted file mode 100644
index 463009a1..00000000
--- a/app/src/main/java/com/deniscerri/ytdlnis/service/DownloadInfo.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.deniscerri.ytdlnis.service
-
-import com.deniscerri.ytdlnis.database.models.ResultItem
-
-class DownloadInfo {
-    var video: ResultItem? = null
-    var progress = 0
-    //var downloadQueue: LinkedList<ResultItem>? = null
-    var outputLine: String? = null
-    var downloadStatus: String? = null
-    var downloadPath: String? = null
-    var downloadType: String? = null
-//    fun setDownloadQueue(downloadQueue: LinkedList<ResultItem>) {
-//        this.downloadQueue = downloadQueue
-//        video = downloadQueue.peek()
-//    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/service/IDownloaderListener.kt b/app/src/main/java/com/deniscerri/ytdlnis/service/IDownloaderListener.kt
deleted file mode 100644
index 75b3054c..00000000
--- a/app/src/main/java/com/deniscerri/ytdlnis/service/IDownloaderListener.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.deniscerri.ytdlnis.service
-
-interface IDownloaderListener {
-    fun onDownloadStart(downloadInfo: DownloadInfo?)
-    fun onDownloadProgress(downloadInfo: DownloadInfo?)
-    fun onDownloadError(downloadInfo: DownloadInfo?)
-    fun onDownloadEnd(downloadInfo: DownloadInfo?)
-    fun onDownloadCancel(downloadInfo: DownloadInfo?)
-    fun onDownloadCancelAll(downloadInfo: DownloadInfo?)
-    fun onDownloadServiceEnd()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/service/IDownloaderService.kt b/app/src/main/java/com/deniscerri/ytdlnis/service/IDownloaderService.kt
deleted file mode 100644
index bbd6ef16..00000000
--- a/app/src/main/java/com/deniscerri/ytdlnis/service/IDownloaderService.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.deniscerri.ytdlnis.service
-
-import android.app.Activity
-import com.deniscerri.ytdlnis.database.models.ResultItem
-
-interface IDownloaderService {
-    val info: DownloadInfo?
-    fun addActivity(activity: Activity?, callback: ArrayList<IDownloaderListener?>?)
-    fun removeActivity(activity: Activity?)
-    fun updateQueue(queue: ArrayList<ResultItem?>?)
-    fun cancelDownload(cancelAll: Boolean)
-    fun removeItemFromDownloadQueue(video: ResultItem?, type: String?)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
index 9a356030..36993db3 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
@@ -9,13 +9,11 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.text.InputType
 import android.util.Log
 import android.view.*
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.*
-import androidx.appcompat.widget.SearchView
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.Fragment
@@ -38,7 +36,6 @@ import com.deniscerri.ytdlnis.util.FileUtil
 import com.deniscerri.ytdlnis.util.InfoUtil
 import com.facebook.shimmer.ShimmerFrameLayout
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.search.SearchBar
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
index 76606695..f53dac90 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
@@ -11,17 +11,14 @@ import android.util.Log
 import android.view.*
 import android.widget.Button
 import android.widget.LinearLayout
-import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.deniscerri.ytdlnis.R
 import com.deniscerri.ytdlnis.adapter.ConfigureMultipleDownloadsAdapter
-import com.deniscerri.ytdlnis.database.models.CommandTemplate
 import com.deniscerri.ytdlnis.database.models.DownloadItem
 import com.deniscerri.ytdlnis.database.viewmodel.CommandTemplateViewModel
 import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt
index dea6f4e4..9ce6e8b3 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt
@@ -28,10 +28,6 @@ import com.deniscerri.ytdlnis.util.UiUtil
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.sql.Date
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
 
 
 class CancelledDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickListener {
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt
index c9767411..1b9d44be 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt
@@ -4,10 +4,8 @@ import android.content.Context
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
-import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
index 833f7378..bdaeb6e1 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
@@ -32,10 +32,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.File
-import java.sql.Date
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
 
 
 class ErroredDownloadsFragment() : Fragment(), GenericDownloadAdapter.OnItemClickListener, OnItemClickListener {
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
index b84d0c52..2abb5719 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
@@ -32,10 +32,6 @@ import com.yausername.youtubedl_android.YoutubeDL
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.sql.Date
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
 
 
 class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickListener {
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt
index 2596de2e..21c885e2 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt
@@ -17,7 +17,7 @@ import com.deniscerri.ytdlnis.R
 import com.deniscerri.ytdlnis.util.FileUtil
 import com.deniscerri.ytdlnis.util.UpdateUtil
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.Json
 import java.util.*
 
 class SettingsFragment : PreferenceFragmentCompat() {
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt
index bedd8690..f5345e3f 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt
@@ -8,7 +8,6 @@ import android.provider.DocumentsContract
 import android.webkit.MimeTypeMap
 import com.deniscerri.ytdlnis.R
 import okhttp3.internal.closeQuietly
-import okhttp3.internal.format
 import java.io.File
 import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
diff --git a/app/src/main/res/layout/history_item_details_bottom_sheet.xml b/app/src/main/res/layout/history_item_details_bottom_sheet.xml
index 048cb6aa..2180e5b6 100644
--- a/app/src/main/res/layout/history_item_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/history_item_details_bottom_sheet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/downloads_element_bottom_sheet"
+<FrameLayout android:id="@+id/downloads_element_bottom_sheet"
     style="@style/Widget.Material3.BottomSheet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"