diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/UpdateSessionModalitiesUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/UpdateSessionModalitiesUseCase.kt
deleted file mode 100644
index 9ffa010539..0000000000
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/UpdateSessionModalitiesUseCase.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.simprints.feature.orchestrator.usecases
-
-import com.simprints.core.ExternalScope
-import com.simprints.infra.config.store.models.GeneralConfiguration.Modality
-import com.simprints.infra.events.SessionEventRepository
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-internal class UpdateSessionModalitiesUseCase @Inject constructor(
-    private val sessionEventRepository: SessionEventRepository,
-    @ExternalScope private val externalScope: CoroutineScope,
-) {
-    operator fun invoke(modalities: List<Modality>) {
-        // Empty modalities is invalid so don't update
-        if (modalities.isEmpty()) return
-         externalScope.launch {
-             val sessionScope = sessionEventRepository.getCurrentSessionScope()
-             val updatedSessionScope = sessionScope.copy(
-                 payload = sessionScope.payload.copy(
-                     modalities = modalities,
-                 )
-             )
-             sessionEventRepository.saveSessionScope(updatedSessionScope)
-         }
-    }
-}
diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt
index 8586c16e4c..f36192bded 100644
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt
+++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt
@@ -14,7 +14,6 @@ import com.simprints.feature.orchestrator.steps.MatchStepStubPayload
 import com.simprints.feature.orchestrator.steps.Step
 import com.simprints.feature.orchestrator.steps.StepId
 import com.simprints.feature.orchestrator.usecases.MapStepsForLastBiometricEnrolUseCase
-import com.simprints.feature.orchestrator.usecases.UpdateSessionModalitiesUseCase
 import com.simprints.feature.selectagegroup.SelectSubjectAgeGroupContract
 import com.simprints.feature.selectsubject.SelectSubjectContract
 import com.simprints.feature.setup.SetupContract
@@ -38,7 +37,6 @@ internal class BuildStepsUseCase @Inject constructor(
     private val buildMatcherSubjectQuery: BuildMatcherSubjectQueryUseCase,
     private val cache: OrchestratorCache,
     private val mapStepsForLastBiometrics: MapStepsForLastBiometricEnrolUseCase,
-    private val updateSessionModalitiesUseCase: UpdateSessionModalitiesUseCase,
 ) {
 
     fun build(action: ActionRequest, projectConfiguration: ProjectConfiguration) = when (action) {
@@ -319,17 +317,6 @@ internal class BuildStepsUseCase @Inject constructor(
                 }
             }
         }
-    }.also { steps ->
-        // Update session with modalities that will actually be used (if user doesn't exit)
-        steps.mapNotNull { step ->
-            when (step.id) {
-                StepId.FINGERPRINT_CAPTURE -> Modality.FINGERPRINT
-                StepId.FACE_CAPTURE -> Modality.FACE
-                else -> null
-            }
-        }.distinct().takeIf { it.isNotEmpty() }?.let { modalities ->
-            updateSessionModalitiesUseCase(modalities)
-        }
     }
 
     private fun buildModalityMatcherSteps(
diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt
index 6410513b3b..991895e796 100644
--- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt
+++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt
@@ -5,7 +5,6 @@ import com.simprints.feature.orchestrator.exceptions.SubjectAgeNotSupportedExcep
 import com.simprints.feature.orchestrator.steps.Step
 import com.simprints.feature.orchestrator.steps.StepId
 import com.simprints.feature.orchestrator.usecases.MapStepsForLastBiometricEnrolUseCase
-import com.simprints.feature.orchestrator.usecases.UpdateSessionModalitiesUseCase
 import com.simprints.infra.config.store.models.AgeGroup
 import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.Finger
@@ -19,7 +18,6 @@ import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.RelaxedMockK
 import io.mockk.mockk
-import io.mockk.verify
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThrows
 import org.junit.Before
@@ -42,15 +40,12 @@ class BuildStepsUseCaseTest {
     @RelaxedMockK
     private lateinit var nec: FingerprintConfiguration.FingerprintSdkConfiguration
 
-    @RelaxedMockK
-    private lateinit var updateSessionModalitiesUseCase: UpdateSessionModalitiesUseCase
-
     private lateinit var useCase: BuildStepsUseCase
 
     @Before
     fun setup() {
         MockKAnnotations.init(this)
-        useCase = BuildStepsUseCase(buildMatcherSubjectQuery, cache, mapStepsForLastBiometrics, updateSessionModalitiesUseCase)
+        useCase = BuildStepsUseCase(buildMatcherSubjectQuery, cache, mapStepsForLastBiometrics)
     }
 
     private fun mockCommonProjectConfiguration(): ProjectConfiguration {
@@ -109,7 +104,6 @@ class BuildStepsUseCaseTest {
             StepId.FINGERPRINT_CAPTURE,
             StepId.FACE_CAPTURE,
         )
-        verify { updateSessionModalitiesUseCase(listOf(Modality.FINGERPRINT, Modality.FACE)) }
     }
 
     @Test