diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt
index 7b415964ef..2515ddf353 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt
@@ -1,6 +1,5 @@
 package org.dhis2.form.ui.provider.inputfield
 
-import android.content.Context
 import android.content.Intent
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.focusable
@@ -23,7 +22,6 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.TextFieldValue
@@ -68,7 +66,6 @@ fun FieldProvider(
     focusManager: FocusManager,
     onNextClicked: () -> Unit,
 ) {
-    val context = LocalContext.current
     val bringIntoViewRequester = remember { BringIntoViewRequester() }
     val focusRequester = remember { FocusRequester() }
     var visibleArea by remember { mutableStateOf(Rect.Zero) }
@@ -112,7 +109,6 @@ fun FieldProvider(
             inputStyle = inputStyle,
             fieldUiModel = fieldUiModel,
             intentHandler = intentHandler,
-            context = context,
             fetchOptions = {
                 intentHandler(
                     FormIntent.FetchOptions(
@@ -484,7 +480,6 @@ fun ProvideByOptionSet(
     inputStyle: InputStyle,
     fieldUiModel: FieldUiModel,
     intentHandler: (FormIntent) -> Unit,
-    context: Context,
     fetchOptions: () -> Unit,
 ) {
     when (fieldUiModel.renderingType) {
@@ -516,7 +511,6 @@ fun ProvideByOptionSet(
                 inputStyle = inputStyle,
                 fieldUiModel = fieldUiModel,
                 intentHandler = intentHandler,
-                context = context,
             )
         }
 
@@ -526,7 +520,6 @@ fun ProvideByOptionSet(
                 inputStyle = inputStyle,
                 fieldUiModel = fieldUiModel,
                 intentHandler = intentHandler,
-                context = context,
             )
         }
 
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MatrixInputProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MatrixInputProvider.kt
index b926d87596..ed0adf2a36 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MatrixInputProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MatrixInputProvider.kt
@@ -1,6 +1,5 @@
 package org.dhis2.form.ui.provider.inputfield
 
-import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
@@ -21,7 +20,6 @@ internal fun ProvideMatrixInput(
     modifier: Modifier,
     inputStyle: InputStyle,
     fieldUiModel: FieldUiModel,
-    context: Context,
     intentHandler: (FormIntent) -> Unit,
 ) {
     val inputCardDataList: MutableList<ImageCardData> = mutableListOf()
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MatrixSequentialUtilites.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MatrixSequentialUtilites.kt
index 6fbe9b727d..a55f3ebcad 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MatrixSequentialUtilites.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MatrixSequentialUtilites.kt
@@ -4,31 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import org.dhis2.form.model.FieldUiModel
-import org.dhis2.ui.MetadataIconData
-import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.mobile.ui.designsystem.component.ImageCardData
 
-@Composable
-fun rememberInputCardList(
-    options: List<Option>?,
-    optionMetadataIconMap: Map<String, MetadataIconData>?,
-) = remember(options) {
-    options?.map { option ->
-        val metadataIconData =
-            optionMetadataIconMap?.get(option.uid()) ?: throw IllegalArgumentException()
-
-        var icon = option.style().icon() ?: "dhis2_dhis2_logo_positive"
-        if (!icon.startsWith("dhis2_")) {
-            icon = "dhis2_$icon"
-        }
-        imageCardDataWithUidAndLabel(
-            metadataIconData.imageCardData,
-            option.code() ?: "",
-            option.displayName() ?: "",
-        )
-    } ?: emptyList()
-}
-
 fun imageCardDataWithUidAndLabel(
     imageCardData: ImageCardData,
     optionCode: String,
@@ -42,7 +19,7 @@ fun imageCardDataWithUidAndLabel(
 
 @Composable
 fun rememberSelectedOption(fieldUiModel: FieldUiModel, inputCardDataList: List<ImageCardData>) =
-    remember(fieldUiModel.displayName) {
+    remember(inputCardDataList, fieldUiModel.displayName) {
         mutableStateOf(
             inputCardDataList.find { it.uid == fieldUiModel.displayName || it.label == fieldUiModel.displayName },
         )
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/SequentialInputProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/SequentialInputProvider.kt
index acdd7e235a..a1036ceef8 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/SequentialInputProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/SequentialInputProvider.kt
@@ -1,6 +1,5 @@
 package org.dhis2.form.ui.provider.inputfield
 
-import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
@@ -21,7 +20,6 @@ internal fun ProvideSequentialInput(
     modifier: Modifier,
     inputStyle: InputStyle,
     fieldUiModel: FieldUiModel,
-    context: Context,
     intentHandler: (FormIntent) -> Unit,
 ) {
     val inputCardDataList: MutableList<ImageCardData> = mutableListOf()
@@ -38,7 +36,6 @@ internal fun ProvideSequentialInput(
             )
         }
     }
-
     var matrixSelectedItem by rememberSelectedOption(
         fieldUiModel = fieldUiModel,
         inputCardDataList = inputCardDataList,