diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index b728a2f63..2cb8bd3c2 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -35,7 +35,6 @@ import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.NavigationUI
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
@@ -945,7 +944,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         isVisuallyComplete = true
     }
 
-    private fun captureSnapshotTelemetryMetrics() = CoroutineScope(Dispatchers.IO).launch {
+    private fun captureSnapshotTelemetryMetrics() = CoroutineScope(IO).launch {
         // PWA
         val recentlyUsedPwaCount = components.core.webAppShortcutManager.recentlyUsedWebAppsCount(
             activeThresholdMs = PWA_RECENTLY_USED_THRESHOLD
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt
index 8e45a1d72..0b732de15 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt
@@ -13,7 +13,6 @@ import mozilla.components.lib.publicsuffixlist.PublicSuffixList
 import mozilla.components.lib.state.Action
 import mozilla.components.lib.state.State
 import mozilla.components.lib.state.Store
-import org.mozilla.fenix.collections.CollectionCreationAction.StepChanged
 import org.mozilla.fenix.components.TabCollectionStorage
 import org.mozilla.fenix.ext.toShortUrl
 import org.mozilla.fenix.home.Tab
diff --git a/app/src/main/java/org/mozilla/fenix/ext/View.kt b/app/src/main/java/org/mozilla/fenix/ext/View.kt
index be75f6300..7112d793a 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/View.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/View.kt
@@ -175,5 +175,5 @@ internal fun View.getKeyboardHeight(): Int {
  * The assumed minimum height of the keyboard.
  */
 @VisibleForTesting
-@Dimension(unit = Dimension.DP)
+@Dimension(unit = DP)
 internal const val MINIMUM_KEYBOARD_HEIGHT = 100
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
index aeef91c46..b74cbcf50 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
@@ -230,7 +230,7 @@ class CreditCardsSettingFragment : BiometricPromptPreferenceFragment() {
             getString(R.string.credit_cards_biometric_prompt_message_pin),
             getString(R.string.credit_cards_biometric_prompt_message)
         )
-        startActivityForResult(intent, BiometricPromptPreferenceFragment.PIN_REQUEST)
+        startActivityForResult(intent, PIN_REQUEST)
     }
 
     private fun navigateToCreditCardManagementFragment() {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
index 1e5280a11..4a1d3da8f 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
@@ -12,7 +12,6 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.cancel
@@ -193,10 +192,7 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da
             .setText(resources.getString(R.string.preferences_delete_browsing_data_snackbar))
             .show()
 
-        if (popAfter) viewLifecycleOwner.lifecycleScope.launch(
-            Dispatchers.Main
-        ) {
-
+        if (popAfter) viewLifecycleOwner.lifecycleScope.launch(Main) {
             findNavController().apply {
                 // If the user deletes all open tabs we need to make sure we remove
                 // the BrowserFragment from the backstack.
@@ -241,9 +237,9 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da
     private fun updateHistoryCount() {
         binding.browsingDataItem.subtitleView.text = ""
 
-        viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
+        viewLifecycleOwner.lifecycleScope.launch(IO) {
             val historyCount = requireComponents.core.historyStorage.getVisited().size
-            launch(Dispatchers.Main) {
+            launch(Main) {
                 binding.browsingDataItem.apply {
                     subtitleView.text =
                         resources.getString(
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt
index f85754055..2c40dce74 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt
@@ -32,7 +32,6 @@ import kotlinx.coroutines.CoroutineScope
 import mozilla.components.browser.menu.BrowserMenu
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.support.test.robolectric.testContext
-import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertSame
@@ -367,8 +366,8 @@ class TabsTrayFragmentTest {
         )
         val behavior = BottomSheetBehavior.from(tabsTrayBinding.tabWrapper)
 
-        Assert.assertFalse(behavior.isFitToContents)
-        Assert.assertFalse(behavior.skipCollapsed)
+        assertFalse(behavior.isFitToContents)
+        assertFalse(behavior.skipCollapsed)
         assert(behavior.halfExpandedRatio <= 0.001f)
     }