diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index e010cafaa..4970a584c 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -37,13 +37,11 @@ class BrowserFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val sessionManager = requireComponents.core.sessionManager
-        val sessionId = "1"
 
         sessionFeature = SessionFeature(
             sessionManager,
             SessionUseCases(sessionManager),
-            engineView,
-            sessionId)
+            engineView)
 
         lifecycle.addObservers(sessionFeature)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
index 251dae833..0021732f7 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -16,6 +16,7 @@ import androidx.navigation.fragment.FragmentNavigator
 import kotlinx.android.synthetic.main.fragment_search.*
 import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
 import mozilla.components.feature.awesomebar.AwesomeBarFeature
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.toolbar.ToolbarIntegration
 import org.mozilla.fenix.ext.requireComponents
@@ -45,8 +46,7 @@ class SearchFragment : Fragment() {
             ToolbarIntegration(
             requireContext(),
             toolbar,
-            ShippedDomainsProvider().also { it.initialize(requireContext()) },
-            "1")
+            ShippedDomainsProvider().also { it.initialize(requireContext()) })
         )
 
         AwesomeBarFeature(awesomeBar, toolbar, null, onEditComplete = ::didActivateSearch)