diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
index d55fe2a8e..5a79337ec 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
@@ -19,7 +19,7 @@ class AccountAuthErrorPreference @JvmOverloads constructor(
     attributeSetId: Int = android.R.attr.preferenceStyle
 ) : Preference(context, attrs, attributeSetId) {
     private var emailView: TextView? = null
-    var email: String? by Delegates.observable<String?>(null) { _, _, new -> updateEmailView(new) }
+    var email: String? by Delegates.observable(null) { _, _, new -> updateEmailView(new) }
 
     init {
         layoutResource = R.layout.account_auth_error_preference
diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
index adc72c2db..d18c7d62b 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
@@ -19,11 +19,11 @@ class AccountPreference @JvmOverloads constructor(
 ) : Preference(context, attrs) {
     private var emailView: TextView? = null
     private var displayNameView: TextView? = null
-    var displayName: String? by Delegates.observable<String?>(null) { _, _, new ->
+    var displayName: String? by Delegates.observable(null) { _, _, new ->
         updateDisplayName(new)
     }
 
-    var email: String? by Delegates.observable<String?>(null) { _, _, new ->
+    var email: String? by Delegates.observable(null) { _, _, new ->
         new?.let { updateEmailText(it) }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
index f9eb4679f..db375d8c8 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
@@ -16,10 +16,8 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import androidx.paging.LivePagedListBuilder
-import androidx.paging.PagedList
 import androidx.paging.PagedListAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -96,7 +94,7 @@ class SitePermissionsExceptionsFragment :
     }
 
     private fun bindEmptyContainerMess(rootView: View) {
-        emptyContainerMessage = rootView.findViewById<View>(R.id.empty_exception_container)
+        emptyContainerMessage = rootView.findViewById(R.id.empty_exception_container)
     }
 
     private fun bindClearButton(rootView: View) {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
index ce03bf978..76a705603 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
@@ -38,7 +38,7 @@ class SitePermissionsFragment : PreferenceFragmentCompat() {
 
     private fun bindExceptions() {
         val keyExceptions = getPreferenceKey(R.string.pref_key_show_site_exceptions)
-        val exceptionsCategory = requireNotNull<Preference>(findPreference(keyExceptions))
+        val exceptionsCategory = requireNotNull(findPreference(keyExceptions))
 
         exceptionsCategory.onPreferenceClickListener = OnPreferenceClickListener {
             val directions = SitePermissionsFragmentDirections.actionSitePermissionsToExceptions()
diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
index 398f6c6e1..a57a3b469 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
@@ -207,7 +207,7 @@ class SitePermissionsManageExceptionsPhoneFeatureFragment : Fragment() {
 
     @VisibleForTesting
     internal fun bindBlockedByAndroidContainer() {
-        blockedByAndroidView = rootView.findViewById<View>(R.id.permissions_blocked_container)
+        blockedByAndroidView = rootView.findViewById(R.id.permissions_blocked_container)
         initSettingsButton(blockedByAndroidView)
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt b/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt
index 901b1c38a..27362ffdd 100644
--- a/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt
@@ -33,7 +33,7 @@ class ExtensionsTest {
         every { components.core.store } returns store
 
         components.tryReloadTabBy("https://www.getpocket.com".getOrigin()!!)
-        verify(exactly = 0) { components.useCases.sessionUseCases.reload(any<String>()) }
+        verify(exactly = 0) { components.useCases.sessionUseCases.reload(any()) }
 
         components.tryReloadTabBy("https://www.mozilla.org".getOrigin()!!)
         verify { components.useCases.sessionUseCases.reload("2") }
diff --git a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccess.kt b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccess.kt
index 7bb2698f4..f8b2055e8 100644
--- a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccess.kt
+++ b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccess.kt
@@ -24,7 +24,7 @@ class MozillaBannedPropertyAccess(config: Config = Config.empty) : Rule(config)
     private val banned by lazy {
         val bannedPropertiesList = valueOrDefault("bannedProperties", "")
         if (bannedPropertiesList.contentEquals("")) {
-            listOf<String>()
+            listOf()
         } else {
             bannedPropertiesList.split(",")
         }