diff --git a/app/src/main/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorage.kt b/app/src/main/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorage.kt
index e83207a3a..bd7eefb41 100644
--- a/app/src/main/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorage.kt
+++ b/app/src/main/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorage.kt
@@ -41,7 +41,7 @@ class NimbusMessagingStorage(
         val nimbusActions = nimbusFeature.actions
 
         val nimbusMessages = nimbusFeature.messages
-        val defaultStyle = StyleData(context)
+        val defaultStyle = StyleData()
         val storageMetadata = metadataStorage.getMetadata()
 
         return nimbusMessages.mapNotNull { (key, value) ->
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 2b8796f44..5a41072ac 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -445,7 +445,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      */
     var searchTermTabGroupsAreEnabled by lazyFeatureFlagPreference(
         appContext.getPreferenceKey(R.string.pref_key_search_term_tab_groups),
-        default = { FxNimbus.features.searchTermGroups.value(appContext).enabled },
+        default = { FxNimbus.features.searchTermGroups.value().enabled },
         featureFlag = FeatureFlags.tabGroupFeature
     )
 
@@ -1209,7 +1209,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     )
 
     private val homescreenSections: Map<HomeScreenSection, Boolean> by lazy {
-        FxNimbus.features.homescreen.value(appContext).sectionsEnabled
+        FxNimbus.features.homescreen.value().sectionsEnabled
     }
 
     var historyMetadataUIFeature by lazyFeatureFlagPreference(
diff --git a/app/src/test/java/org/mozilla/fenix/gleanplumb/DefaultMessageControllerTest.kt b/app/src/test/java/org/mozilla/fenix/gleanplumb/DefaultMessageControllerTest.kt
index 962126090..5a7f85d66 100644
--- a/app/src/test/java/org/mozilla/fenix/gleanplumb/DefaultMessageControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/gleanplumb/DefaultMessageControllerTest.kt
@@ -125,7 +125,7 @@ class DefaultMessageControllerTest {
         verify { store.dispatch(MessageDisplayed(message)) }
     }
 
-    private fun mockMessage(data: MessageData = MessageData(_context = testContext)) = Message(
+    private fun mockMessage(data: MessageData = MessageData()) = Message(
         id = "id",
         data = data,
         style = mockk(relaxed = true),