diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
index 222b27428..265f8b2a1 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
@@ -78,7 +78,7 @@ class CollectionCreationUIView(
             }
         }
 
-        view.name_collection_edittext.setOnEditorActionListener { v, actionId, event ->
+        view.name_collection_edittext.setOnEditorActionListener { v, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_DONE && !v.text.toString().isEmpty()) {
                 when (step) {
                     is SaveCollectionStep.NameCollection -> {
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
index 1ee551189..563e47bb5 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
@@ -148,7 +148,7 @@ class BookmarkAdapter(val emptyView: View, val actionEmitter: Observer<BookmarkA
             bookmark_separator.visibility = View.GONE
             bookmark_layout.isClickable = true
 
-            val bookmarkItemMenu = BookmarkItemMenu(containerView!!.context, item) {
+            val bookmarkItemMenu = BookmarkItemMenu(containerView.context, item) {
                 when (it) {
                     is BookmarkItemMenu.Item.Edit -> {
                         actionEmitter.onNext(BookmarkAction.Edit(item))
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt
index ed2d0db57..e1f558b29 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt
@@ -119,7 +119,7 @@ class SelectBookmarkFolderAdapter(private val sharedViewModel: BookmarksSharedVi
         return if (this != null) {
             val newList = list.plus(listOf(BookmarkNodeWithDepth(depth, this, this.parentGuid)))
             newList.plus(
-                children?.filter { it?.type == BookmarkNodeType.FOLDER }
+                children?.filter { it.type == BookmarkNodeType.FOLDER }
                     ?.flatMap { it.convertToFolderDepthTree(depth + 1) }
                     ?: listOf())
         } else listOf()
diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt
index 7c8902703..9c5176d4f 100644
--- a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt
@@ -46,7 +46,6 @@ class OnboardingRadioButton : RadioButton {
             updateRadioValue(true)
             toggleRadioGroups()
             clickListener?.invoke()
-            true
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
index bdd922dde..f20fb3b99 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
@@ -82,11 +82,10 @@ class DeleteBrowsingDataFragment : Fragment(), CoroutineScope {
             })
         }
 
-        view?.open_tabs_item?.onCheckListener = { _ -> updateDeleteButton() }
-        view?.browsing_data_item?.onCheckListener = { _ -> updateDeleteButton() }
-        view?.collections_item?.onCheckListener = { _ -> updateDeleteButton() }
-
-        view?.delete_data?.setOnClickListener {
+        view.open_tabs_item?.onCheckListener = { _ -> updateDeleteButton() }
+        view.browsing_data_item?.onCheckListener = { _ -> updateDeleteButton() }
+        view.collections_item?.onCheckListener = { _ -> updateDeleteButton() }
+        view.delete_data?.setOnClickListener {
             askToDelete()
         }
     }