diff --git a/CHANGELOG.md b/CHANGELOG.md
index 436b1abb21c..453b60a867e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 ### Changes
 
 - Hide next button when registration is going
+- Remove hypertension and diabetes questions from medical history screen
 
 ## 2025.09.09
 
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEffect.kt b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEffect.kt
index 37858da59a7..93a762a136a 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEffect.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEffect.kt
@@ -17,14 +17,4 @@ sealed class NewMedicalHistoryViewEffect : NewMedicalHistoryEffect()
 
 data class OpenPatientSummaryScreen(val patientUuid: UUID) : NewMedicalHistoryViewEffect()
 
-data object ShowOngoingHypertensionTreatmentError : NewMedicalHistoryViewEffect()
-
-data object ShowDiagnosisRequiredError : NewMedicalHistoryViewEffect()
-
-data object ShowHypertensionDiagnosisRequiredError : NewMedicalHistoryViewEffect()
-
-data object ShowChangeDiagnosisErrorDialog : NewMedicalHistoryViewEffect()
-
-data object ShowOngoingDiabetesTreatmentErrorDialog : NewMedicalHistoryViewEffect()
-
 data object GoBack : NewMedicalHistoryViewEffect()
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEvent.kt b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEvent.kt
index 88c6b492738..2b42adf1892 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEvent.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEvent.kt
@@ -29,10 +29,6 @@ data class CurrentFacilityLoaded(val facility: Facility) : NewMedicalHistoryEven
 
 data class SyncTriggered(val registeredPatientUuid: UUID) : NewMedicalHistoryEvent()
 
-data object ChangeDiagnosisNotNowClicked : NewMedicalHistoryEvent() {
-  override val analyticsName = "New Medical History:Change Diagnosis:Not Now Clicked"
-}
-
 data object BackClicked : NewMedicalHistoryEvent() {
   override val analyticsName: String = "New Medical History:Back Clicked"
 }
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryModel.kt b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryModel.kt
index 4787d13f24c..8be45e53ddd 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryModel.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryModel.kt
@@ -19,7 +19,6 @@ data class NewMedicalHistoryModel(
     val ongoingMedicalHistoryEntry: OngoingMedicalHistoryEntry,
     val currentFacility: Facility?,
     val nextButtonState: ButtonState?,
-    val hasShownChangeDiagnosisError: Boolean,
     val showIsSmokingQuestion: Boolean,
     val showSmokelessTobaccoQuestion: Boolean,
 ) : Parcelable {
@@ -36,12 +35,6 @@ data class NewMedicalHistoryModel(
   val facilityDiabetesManagementEnabled: Boolean
     get() = currentFacility!!.config.diabetesManagementEnabled
 
-  val hasAnsweredBothDiagnosisQuestions: Boolean
-    get() = !(ongoingMedicalHistoryEntry.diagnosedWithHypertension == Unanswered || ongoingMedicalHistoryEntry.hasDiabetes == Unanswered)
-
-  val hasAnsweredHypertensionDiagnosis: Boolean
-    get() = ongoingMedicalHistoryEntry.diagnosedWithHypertension != Unanswered
-
   val registeringPatient: Boolean
     get() = nextButtonState == ButtonState.SAVING
 
@@ -51,27 +44,12 @@ data class NewMedicalHistoryModel(
   val diagnosedWithDiabetes: Boolean
     get() = ongoingMedicalHistoryEntry.hasDiabetes == Yes
 
-  val answeredIsOnHypertensionTreatment: Boolean
-    get() = ongoingMedicalHistoryEntry.isOnHypertensionTreatment != Unanswered
-
-  val answeredIsOnDiabetesTreatment: Boolean
-    get() = ongoingMedicalHistoryEntry.isOnDiabetesTreatment != Unanswered
-
   val showOngoingHypertensionTreatment: Boolean
     get() = diagnosedWithHypertension && (country.isoCountryCode == Country.INDIA || country.isoCountryCode == Country.SRI_LANKA)
 
   val showOngoingDiabetesTreatment: Boolean
     get() = facilityDiabetesManagementEnabled && diagnosedWithDiabetes && country.isoCountryCode == Country.INDIA
 
-  private val hasNoHypertension: Boolean
-    get() = ongoingMedicalHistoryEntry.diagnosedWithHypertension == No
-
-  private val hasNoDiabetes: Boolean
-    get() = ongoingMedicalHistoryEntry.hasDiabetes == No
-
-  val showChangeDiagnosisError: Boolean
-    get() = facilityDiabetesManagementEnabled && !hasShownChangeDiagnosisError && hasNoHypertension && hasNoDiabetes
-
   companion object {
     fun default(
         country: Country,
@@ -83,7 +61,6 @@ data class NewMedicalHistoryModel(
         ongoingMedicalHistoryEntry = OngoingMedicalHistoryEntry(),
         currentFacility = null,
         nextButtonState = null,
-        hasShownChangeDiagnosisError = false,
         showIsSmokingQuestion = showIsSmokingQuestion,
         showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion
     )
@@ -108,8 +85,4 @@ data class NewMedicalHistoryModel(
   fun patientRegistered(): NewMedicalHistoryModel {
     return copy(nextButtonState = ButtonState.SAVED)
   }
-
-  fun changeDiagnosisErrorShown(): NewMedicalHistoryModel {
-    return copy(hasShownChangeDiagnosisError = true)
-  }
 }
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryScreen.kt b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryScreen.kt
index 6a32b3d8b56..7de6f8c69b5 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryScreen.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryScreen.kt
@@ -100,41 +100,10 @@ class NewMedicalHistoryScreen : Fragment(), NewMedicalHistoryUiActions, HandlesB
     router.push(PatientSummaryScreenKey(patientUuid, OpenIntention.ViewNewPatient, Instant.now(utcClock)))
   }
 
-  override fun showOngoingHypertensionTreatmentErrorDialog() {
-    SelectOngoingHypertensionTreatmentErrorDialog.show(fragmentManager = activity.supportFragmentManager)
-  }
-
-  override fun showOngoingDiabetesTreatmentErrorDialog() {
-    SelectOngoingDiabetesTreatmentErrorDialog.show(fragmentManager = activity.supportFragmentManager)
-  }
-
   override fun goBack() {
     router.pop()
   }
 
-  override fun showDiagnosisRequiredErrorDialog() {
-    SelectDiagnosisErrorDialog.show(activity.supportFragmentManager)
-  }
-
-  override fun showHypertensionDiagnosisRequiredErrorDialog() {
-    MaterialAlertDialogBuilder(requireContext())
-        .setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
-        .setMessage(getString(R.string.select_diagnosis_error_enter_diagnosis_hypertension))
-        .setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
-        .show()
-  }
-
-  override fun showChangeDiagnosisErrorDialog() {
-    MaterialAlertDialogBuilder(requireContext())
-        .setTitle(getString(R.string.change_diagnosis_title))
-        .setMessage(getString(R.string.change_diagnosis_message))
-        .setPositiveButton(getString(R.string.change_diagnosis_positive), null)
-        .setNegativeButton(getString(R.string.change_diagnosis_negative)) { _, _ ->
-          viewModel.dispatch(ChangeDiagnosisNotNowClicked)
-        }
-        .show()
-  }
-
   override fun onBackPressed(): Boolean {
     viewModel.dispatch(BackClicked)
     return true
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUiActions.kt b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUiActions.kt
index 192e04f2e87..fc23a0c95ea 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUiActions.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUiActions.kt
@@ -4,11 +4,5 @@ import java.util.UUID
 
 interface NewMedicalHistoryUiActions {
   fun openPatientSummaryScreen(patientUuid: UUID)
-  fun showOngoingHypertensionTreatmentErrorDialog()
-  fun showDiagnosisRequiredErrorDialog()
-  fun showHypertensionDiagnosisRequiredErrorDialog()
-  fun showChangeDiagnosisErrorDialog()
-  fun showOngoingDiabetesTreatmentErrorDialog()
-
   fun goBack()
 }
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdate.kt b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdate.kt
index 9a0f8c6d47c..8631572b6d6 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdate.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdate.kt
@@ -16,37 +16,15 @@ class NewMedicalHistoryUpdate : Update<NewMedicalHistoryModel, NewMedicalHistory
   ): Next<NewMedicalHistoryModel, NewMedicalHistoryEffect> {
     return when (event) {
       is NewMedicalHistoryAnswerToggled -> answerToggled(model, event.question, event.answer)
-      is SaveMedicalHistoryClicked -> saveClicked(model)
+      is SaveMedicalHistoryClicked -> registerPatient(model)
       is PatientRegistered -> next(model.patientRegistered(), TriggerSync(event.patientUuid))
       is OngoingPatientEntryLoaded -> next(model.ongoingPatientEntryLoaded(event.ongoingNewPatientEntry))
       is CurrentFacilityLoaded -> currentFacilityLoaded(event, model)
       is SyncTriggered -> dispatch(OpenPatientSummaryScreen(event.registeredPatientUuid))
-      is ChangeDiagnosisNotNowClicked -> registerPatient(model)
       is BackClicked -> dispatch(GoBack)
     }
   }
 
-  private fun saveClicked(model: NewMedicalHistoryModel): Next<NewMedicalHistoryModel, NewMedicalHistoryEffect> {
-    return when {
-      model.showChangeDiagnosisError -> {
-        next(model.changeDiagnosisErrorShown(), ShowChangeDiagnosisErrorDialog)
-      }
-      model.facilityDiabetesManagementEnabled && !model.hasAnsweredBothDiagnosisQuestions -> {
-        dispatch(ShowDiagnosisRequiredError)
-      }
-      !model.facilityDiabetesManagementEnabled && !model.hasAnsweredHypertensionDiagnosis -> {
-        dispatch(ShowHypertensionDiagnosisRequiredError)
-      }
-      model.showOngoingHypertensionTreatment && !model.answeredIsOnHypertensionTreatment -> {
-        dispatch(ShowOngoingHypertensionTreatmentError)
-      }
-      model.showOngoingDiabetesTreatment && !model.answeredIsOnDiabetesTreatment -> {
-        dispatch(ShowOngoingDiabetesTreatmentErrorDialog)
-      }
-      else -> registerPatient(model)
-    }
-  }
-
   private fun registerPatient(model: NewMedicalHistoryModel): Next<NewMedicalHistoryModel, NewMedicalHistoryEffect> {
     return if (model.registeringPatient) {
       noChange()
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryViewEffectHandler.kt b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryViewEffectHandler.kt
index 6e4434cfdf5..4746ed1ba27 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryViewEffectHandler.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryViewEffectHandler.kt
@@ -10,11 +10,6 @@ class NewMedicalHistoryViewEffectHandler(
   override fun handle(viewEffect: NewMedicalHistoryViewEffect) {
     when (viewEffect) {
       is OpenPatientSummaryScreen -> uiActions.openPatientSummaryScreen(viewEffect.patientUuid)
-      ShowOngoingHypertensionTreatmentError -> uiActions.showOngoingHypertensionTreatmentErrorDialog()
-      ShowDiagnosisRequiredError -> uiActions.showDiagnosisRequiredErrorDialog()
-      ShowHypertensionDiagnosisRequiredError -> uiActions.showHypertensionDiagnosisRequiredErrorDialog()
-      ShowChangeDiagnosisErrorDialog -> uiActions.showChangeDiagnosisErrorDialog()
-      ShowOngoingDiabetesTreatmentErrorDialog -> uiActions.showOngoingDiabetesTreatmentErrorDialog()
       GoBack -> uiActions.goBack()
     }.exhaustive()
   }
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryDiagnosisWithTreatment.kt b/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryDiagnosisWithTreatment.kt
deleted file mode 100644
index 555b287ee4e..00000000000
--- a/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryDiagnosisWithTreatment.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.simple.clinic.medicalhistory.ui
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Card
-import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import org.simple.clinic.R
-import org.simple.clinic.appconfig.Country
-import org.simple.clinic.common.ui.theme.SimpleTheme
-import org.simple.clinic.medicalhistory.Answer
-import org.simple.clinic.medicalhistory.MedicalHistoryQuestion
-import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnHypertensionTreatment
-
-@Composable
-fun MedicalHistoryDiagnosisWithTreatment(
-    diagnosisQuestion: MedicalHistoryQuestion,
-    diagnosisLabel: String,
-    diagnosisAnswer: Answer?,
-    treatmentQuestion: MedicalHistoryQuestion,
-    treatmentAnswer: Answer?,
-    showTreatmentQuestion: Boolean,
-    modifier: Modifier = Modifier,
-    onSelectionChange: (MedicalHistoryQuestion, Answer) -> Unit,
-) {
-    LaunchedEffect(showTreatmentQuestion) {
-        if (!showTreatmentQuestion) {
-            onSelectionChange(treatmentQuestion, Answer.Unanswered)
-        }
-    }
-
-    Card(modifier = modifier.fillMaxWidth()) {
-        Column(
-            modifier = Modifier
-                .padding(horizontal = dimensionResource(R.dimen.spacing_16))
-                .padding(
-                    top = dimensionResource(R.dimen.spacing_16),
-                    bottom = dimensionResource(R.dimen.spacing_4)
-                )
-        ) {
-            Text(
-                modifier = Modifier
-                    .padding(bottom = dimensionResource(R.dimen.spacing_4)),
-                text = diagnosisLabel,
-                style = SimpleTheme.typography.subtitle1Medium,
-                color = MaterialTheme.colors.onSurface,
-            )
-
-            MedicalHistoryQuestionOptions(
-                modifier = Modifier.align(Alignment.End),
-                selectedAnswer = diagnosisAnswer,
-                onSelectionChange = { newAnswer ->
-                    if (newAnswer == diagnosisAnswer) {
-                        onSelectionChange(diagnosisQuestion, Answer.Unanswered)
-                    } else {
-                        onSelectionChange(diagnosisQuestion, newAnswer)
-                    }
-                }
-            )
-
-            AnimatedVisibility(
-                visible = showTreatmentQuestion
-            ) {
-                Column {
-                    Divider(
-                        modifier = Modifier.padding(
-                            top = dimensionResource(R.dimen.spacing_4),
-                            bottom = dimensionResource(R.dimen.spacing_8)
-                        ),
-                        color = SimpleTheme.colors.onSurface11
-                    )
-
-                    Text(
-                        modifier = Modifier
-                            .padding(bottom = dimensionResource(R.dimen.spacing_4)),
-                        text = stringResource(treatmentQuestion.questionRes),
-                        style = MaterialTheme.typography.body1,
-                        color = MaterialTheme.colors.onSurface,
-                    )
-
-                    MedicalHistoryQuestionOptions(
-                        modifier = Modifier.align(Alignment.End),
-                        selectedAnswer = treatmentAnswer,
-                        onSelectionChange = { newAnswer ->
-                            if (newAnswer == treatmentAnswer) {
-                                onSelectionChange(treatmentQuestion, Answer.Unanswered)
-                            } else {
-                                onSelectionChange(treatmentQuestion, newAnswer)
-                            }
-                        }
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Preview
-@Composable
-private fun MedicalHistoryDiagnosisWithTreatmentPreview() {
-    SimpleTheme {
-        MedicalHistoryDiagnosisWithTreatment(
-            diagnosisQuestion = MedicalHistoryQuestion.DiagnosedWithHypertension,
-            diagnosisLabel = stringResource(R.string.medicalhistory_diagnosis_hypertension_required),
-            diagnosisAnswer = Answer.Yes,
-            treatmentQuestion = IsOnHypertensionTreatment(Country.INDIA),
-            treatmentAnswer = Answer.Unanswered,
-            showTreatmentQuestion = true,
-            onSelectionChange = { _, _ -> }
-        )
-    }
-}
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/ui/NewMedicalHistoryUi.kt b/app/src/main/java/org/simple/clinic/medicalhistory/ui/NewMedicalHistoryUi.kt
index 10f1141b261..d3e29278490 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/ui/NewMedicalHistoryUi.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/ui/NewMedicalHistoryUi.kt
@@ -27,10 +27,6 @@ import org.simple.clinic.common.ui.components.TopAppBar
 import org.simple.clinic.common.ui.theme.SimpleTheme
 import org.simple.clinic.medicalhistory.Answer
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion
-import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.DiagnosedWithDiabetes
-import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.DiagnosedWithHypertension
-import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnDiabetesTreatment
-import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnHypertensionTreatment
 import org.simple.clinic.medicalhistory.OngoingMedicalHistoryEntry
 import org.simple.clinic.medicalhistory.newentry.NewMedicalHistoryModel
 
@@ -80,33 +76,13 @@ fun NewMedicalHistoryUi(
       val scrollState = rememberScrollState()
       Column(
           modifier = Modifier
-                  .fillMaxWidth()
-                  .verticalScroll(scrollState)
-                  .padding(paddingValues)
-                  .padding(dimensionResource(R.dimen.spacing_8)),
+              .fillMaxWidth()
+              .verticalScroll(scrollState)
+              .padding(paddingValues)
+              .padding(dimensionResource(R.dimen.spacing_8)),
           verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.spacing_8))
       ) {
         val showDiabetesDiagnosis = model.hasLoadedCurrentFacility && model.facilityDiabetesManagementEnabled
-        MedicalHistoryDiagnosisWithTreatment(
-            diagnosisLabel = stringResource(R.string.medicalhistory_diagnosis_hypertension_required),
-            diagnosisQuestion = DiagnosedWithHypertension,
-            diagnosisAnswer = model.ongoingMedicalHistoryEntry.diagnosedWithHypertension,
-            treatmentQuestion = IsOnHypertensionTreatment(model.country.isoCountryCode),
-            treatmentAnswer = model.ongoingMedicalHistoryEntry.isOnHypertensionTreatment,
-            showTreatmentQuestion = model.showOngoingHypertensionTreatment,
-            onSelectionChange = onSelectionChange
-        )
-        if (showDiabetesDiagnosis) {
-          MedicalHistoryDiagnosisWithTreatment(
-              diagnosisLabel = stringResource(R.string.medicalhistory_diagnosis_diabetes_required),
-              diagnosisQuestion = DiagnosedWithDiabetes,
-              diagnosisAnswer = model.ongoingMedicalHistoryEntry.hasDiabetes,
-              treatmentQuestion = IsOnDiabetesTreatment,
-              treatmentAnswer = model.ongoingMedicalHistoryEntry.isOnDiabetesTreatment,
-              showTreatmentQuestion = model.showOngoingDiabetesTreatment,
-              onSelectionChange = onSelectionChange
-          )
-        }
         HistoryContainer(
             heartAttackAnswer = model.ongoingMedicalHistoryEntry.hasHadHeartAttack,
             strokeAnswer = model.ongoingMedicalHistoryEntry.hasHadStroke,
@@ -139,7 +115,6 @@ private val previewMedicalHistoryModel = NewMedicalHistoryModel(
     ongoingMedicalHistoryEntry = OngoingMedicalHistoryEntry(),
     currentFacility = null,
     nextButtonState = null,
-    hasShownChangeDiagnosisError = true,
     showIsSmokingQuestion = true,
     showSmokelessTobaccoQuestion = true
 )
@@ -151,7 +126,7 @@ private fun NewMedicalHistoryUiPreview() {
       model = previewMedicalHistoryModel,
       navigationIconClick = {},
       onNextClick = {}
-  ) { question, answer ->
+  ) { _, _ ->
     //do nothing
   }
 }
diff --git a/app/src/main/res/values-am-rET/strings.xml b/app/src/main/res/values-am-rET/strings.xml
index 68570ef8789..007fe83fc3f 100644
--- a/app/src/main/res/values-am-rET/strings.xml
+++ b/app/src/main/res/values-am-rET/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">የኩላሊት በሽታ</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">ከፍተኛ የደም ግፊት</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">የደም ግፊት ምርመራ (አስፈላጊ)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">የስኳር በሽታ</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">የስኳር በሽታ ምርመራ (አስፈላጊ)</string>
   <string name="newmedicalhistory_next">ቀጣይ</string>
   <string name="newmedicalhistory_yes">አዎ</string>
   <string name="newmedicalhistory_no">አይ</string>
@@ -673,7 +671,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">ምርመራ ያስፈልጋል</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">ለሁለቱም የደም ግፊት እና የስኳር በሽታ ምርመራን ይምረጡ</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">ለደም ግፊት ምርመራን ይምረጡ</string>
   <string name="select_diagnosis_error_ok">እሺ</string>
   <string name="sheet_teleconsult_status_title">ቴሌ-ማማከር ተጠናቅቋል?</string>
   <string name="sheet_teleconsult_status_yes">አዎ</string>
@@ -756,12 +753,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">በህይወት የለም</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">ምርመራ ይለወጥ?</string>
-  <string name="change_diagnosis_message">በሽተኛው የደም ግፊት ወይም የስኳር በሽታ እንዳለበት ከታወቀ እባክዎን አዎ ብለው ምልክት ያድርጉ።</string>
-  <string name="change_diagnosis_positive">ይቀይሩ</string>
-  <string name="change_diagnosis_negative">አሁን አይደለም</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">ማውረድ አልተሳካም።</string>
   <string name="overdue_download_notification_failed_subtitle">ከተወሰነ ጊዜ በኋላ እንደገና ይሞክሩ</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 6a183b2db31..774fa74d819 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">কিডনির অসুখ</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">হাইপারটেনশন</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">হাইপারটেনশন ডায়াগনোসিস (প্রয়োজন)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">ডায়াবেটিস</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">ডায়াবেটিস ডায়াগনোসিস (প্রয়োজন)</string>
   <string name="newmedicalhistory_next">পরবর্তী</string>
   <string name="newmedicalhistory_yes">হ্যাঁ</string>
   <string name="newmedicalhistory_no">না</string>
@@ -673,7 +671,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">রোগ নির্ণয় প্রয়োজন</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">হাইপারটেনশন এবং ডায়াবেটিস উভয়ের জন্য একটি রোগ নির্ণয় নির্বাচন করুন</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">হাইপারটেনশনের জন্য একটি ডায়াগনোসিস নির্বাচন করুন</string>
   <string name="select_diagnosis_error_ok">ঠিক আছে</string>
   <string name="sheet_teleconsult_status_title">টেলি-কনসাল্ট সম্পূর্ণ হয়ে গেছে?</string>
   <string name="sheet_teleconsult_status_yes">হ্যাঁ</string>
@@ -756,12 +753,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">মারা গেছে</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">ডায়গোনসিস পরিবর্তন করবেন?</string>
-  <string name="change_diagnosis_message">রোগীর কোনও সময় হাইপারটেনশন বা ডায়াবেটিস নির্নীত হয়ে থাকলে অনুগ্রহ করে হ্যাঁ চিহ্নিত করুন।</string>
-  <string name="change_diagnosis_positive">পরিবর্তন করুন</string>
-  <string name="change_diagnosis_negative">এখন না</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">ডাউনলোড ব্যর্থ যায়নি</string>
   <string name="overdue_download_notification_failed_subtitle">কিছু সময়ের মধ্যে আবার চেষ্টা করুন</string>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index 6e71ebb5774..5cfc5b0a413 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">কিডনি র রোগের হিস্ট্রি আছে</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">হাইপারটেনশন নির্ণীত হয়েছে</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">হাইপারটেনশন ডায়াগনোসিস (আবশ্যক)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">ডায়াবেটিস আছে</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">ডায়াবেটিস ডায়াগনোসিস (আবশ্যক)</string>
   <string name="newmedicalhistory_next">পরবর্তী</string>
   <string name="newmedicalhistory_yes">হ্যাঁ</string>
   <string name="newmedicalhistory_no">না</string>
@@ -668,7 +666,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">রোগ নির্ণয় প্রয়োজন</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">হাইপারটেনশন এবং ডায়াবেটিস উভয়ের জন্য একটি রোগ নির্ণয় নির্বাচন করুন</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">হাইপারটেনশনের জন্য একটি ডায়াগনোসিস নির্বাচন করুন</string>
   <string name="select_diagnosis_error_ok">ঠিক আছে</string>
   <string name="sheet_teleconsult_status_title">টেলি-কনসাল্ট সম্পূর্ণ হয়ে গেছে?</string>
   <string name="sheet_teleconsult_status_yes">হ্যাঁ</string>
@@ -751,12 +748,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">মারা গেছে</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">ডায়গোনসিস পরিবর্তন করবেন?</string>
-  <string name="change_diagnosis_message">রোগীর কোনও সময় হাইপারটেনশন বা ডায়াবেটিস নির্নীত হয়ে থাকলে অনুগ্রহ করে হ্যাঁ চিহ্নিত করুন।</string>
-  <string name="change_diagnosis_positive">পরিবর্তন করুন</string>
-  <string name="change_diagnosis_negative">এখন না</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">ডাউনলোড ব্যর্থ হয়েছে</string>
   <string name="overdue_download_notification_failed_subtitle">কিছু সময়ের মধ্যে আবার চেষ্টা করুন</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4c63224e246..a59e6399acc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -332,10 +332,8 @@
   <string name="medicalhistory_question_kidney">Enfermedad renal</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">Hipertensión</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">Diagnóstico de hipertensión (requerido)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">Diabetes</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">Diagnóstico de diabetes (requerido)</string>
   <string name="newmedicalhistory_next">Siguiente</string>
   <string name="newmedicalhistory_yes">Sí</string>
   <string name="newmedicalhistory_no">No</string>
@@ -677,7 +675,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">Se requiere un diagnóstico</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">Seleccione diagnósticos para hipertensión y diabetes</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">Seleccione un diagnóstico para hipertensión</string>
   <string name="select_diagnosis_error_ok">OK</string>
   <string name="sheet_teleconsult_status_title">¿Teleconsulta completa?</string>
   <string name="sheet_teleconsult_status_yes">Sí</string>
@@ -760,12 +757,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">Fallecido</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">¿Cambiar el diagnóstico?</string>
-  <string name="change_diagnosis_message">Si el paciente ha sido diagnosticado alguna vez con hipertensión o diabetes, marque SÍ.</string>
-  <string name="change_diagnosis_positive">CAMBIAR</string>
-  <string name="change_diagnosis_negative">AHORA NO</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">La descarga falló</string>
   <string name="overdue_download_notification_failed_subtitle">Inténtelo de nuevo en un rato</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index c78e91248bf..c3caf42ac47 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">गुर्दे की बीमारी</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">हाइपरटेंशन</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">उच्च रक्तचाप निदान (ज़रूरी)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">मधुमेह</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">मधुमेह निदान (ज़रूरी)</string>
   <string name="newmedicalhistory_next">आगे</string>
   <string name="newmedicalhistory_yes">हाँ</string>
   <string name="newmedicalhistory_no">नहीं</string>
@@ -669,7 +667,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">निदान आवश्यक</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">उच्चरक्तचाप और मधुमेह दोनों के लिए एक निदान चुनें</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">उच्च रक्तचाप के निदान का चयन करें</string>
   <string name="select_diagnosis_error_ok">ठीक है</string>
   <string name="sheet_teleconsult_status_title">टेली-कंसल्ट पूरा हुआ?</string>
   <string name="sheet_teleconsult_status_yes">हाँ</string>
@@ -752,12 +749,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">जीवित नहीं</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">निदान का तरीका बदलें?</string>
-  <string name="change_diagnosis_message">अगर रोगी को कभी उच्च रक्तचाप या मधुमेह का निदान किया गया है, तो कृपया हाँ चिह्नित करें।</string>
-  <string name="change_diagnosis_positive">बदलें</string>
-  <string name="change_diagnosis_negative">अभी नहीं</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">डाउनलोड विफल हुआ</string>
   <string name="overdue_download_notification_failed_subtitle">कुछ समय बाद फिर से कोशिश करें</string>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
index 06474e5829a..5ad3d26cefc 100644
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">ಮೂತ್ರಪಿಂಡ ರೋಗ</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">ಅಧಿಕ ರಕ್ತದೊತ್ತಡ</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">ಹೈಪರ್‌ಟೆನ್ಶನ್ ಡಯಾಗ್ನಾಸಿಸ್ (ಅಗತ್ಯವಿದೆ)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">ಡಯಾಬಿಟಿಸ್</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">ಡಯಾಬಿಟಿಸ್ ಡಯಾಗ್ನಾಸಿಸ್ (ಅಗತ್ಯವಿದೆ)</string>
   <string name="newmedicalhistory_next">ಮುಂದಿನ</string>
   <string name="newmedicalhistory_yes">ಹೌದು</string>
   <string name="newmedicalhistory_no">ಇಲ್ಲ</string>
@@ -668,7 +666,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">ರೋಗನಿರ್ಣಯ ಅಗತ್ಯವಿದೆ</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">ಹೈಪರ್‌ಟೆನ್ಶನ್ ಮತ್ತು ಡಯಾಬಿಟಿಸ್ ಎರಡಕ್ಕೂ ರೋಗನಿರ್ಣಯ ಆಯ್ಕೆಮಾಡಿ</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">ಹೈಪರ್‌ಟೆನ್ಶನ್‌ಗಾಗಿ ಡಯಾಗ್ನಾಸಿಸ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
   <string name="select_diagnosis_error_ok">ಸರಿ</string>
   <string name="sheet_teleconsult_status_title">ಟೆಲೆ-ಕನ್ಸಲ್ಟ್ ಪೂರ್ಣಗೊಂಡಿದೆಯೇ?</string>
   <string name="sheet_teleconsult_status_yes">ಹೌದು</string>
@@ -751,12 +748,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">ಮರಣ ಹೊಂದಿದ್ದಾರೆ</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">ಡಯಾಗ್ನಾಸಿಸ್ ಬದಲಿಸುವುದೇ?</string>
-  <string name="change_diagnosis_message">ರೋಗಿಯಲ್ಲಿ ಎಂದಿಗಾದರೂ ಹೈಪರ್‌ಟೆನ್ಶನ್ ಅಥವಾ ಡಯಾಬಿಟಿಸ್ ಪತ್ತೆಮಾಡಲಾಗಿದ್ದರೆ ಹೌದು ಎಂದು ಗುರುತು ಮಾಡಿ.</string>
-  <string name="change_diagnosis_positive">ಬದಲಾಯಿಸಿ</string>
-  <string name="change_diagnosis_negative">ಈಗ ಬೇಡ</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">ಡೌನ್‌ಲೋಡ್ ವಿಫಲವಾಗಿದೆ</string>
   <string name="overdue_download_notification_failed_subtitle">ಸ್ವಲ್ಪ ಸಮಯದಲ್ಲಿ ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ</string>
diff --git a/app/src/main/res/values-mr-rIN/strings.xml b/app/src/main/res/values-mr-rIN/strings.xml
index beec6269c7e..b8e26633f94 100644
--- a/app/src/main/res/values-mr-rIN/strings.xml
+++ b/app/src/main/res/values-mr-rIN/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">किडनीचा आजार</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">उच्च रक्तदाब</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">हायपरटेंशन निदान (आवश्यक)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">मधुमेह</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">मधुमेह निदान (आवश्यक)</string>
   <string name="newmedicalhistory_next">पुढील</string>
   <string name="newmedicalhistory_yes">होय</string>
   <string name="newmedicalhistory_no">नाही</string>
@@ -668,7 +666,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">निदान आवश्यक आहे</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">अतिरक्तदाब आणि मधुमेह या दोन्हीसाठी निदान निवडा</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">हायपरटेंशनसाठी निदान निवडा</string>
   <string name="select_diagnosis_error_ok">ठीक आहे</string>
   <string name="sheet_teleconsult_status_title">टेलि-कन्‍सल्‍ट पूर्ण झाले?</string>
   <string name="sheet_teleconsult_status_yes">होय</string>
@@ -751,12 +748,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">मृत झाले</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">निदान बदलायचे?</string>
-  <string name="change_diagnosis_message">जर रुग्णाला उच्च रक्तदाबाचे किंवा मधुमेहाचे निदान झाले असेल तर कृपया होय वर खूण करा.</string>
-  <string name="change_diagnosis_positive">बदला</string>
-  <string name="change_diagnosis_negative">आता नाही</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">डाउनलोड अयशस्वी</string>
   <string name="overdue_download_notification_failed_subtitle">काही वेळाने पुन्हा प्रयत्न करा</string>
diff --git a/app/src/main/res/values-om-rET/strings.xml b/app/src/main/res/values-om-rET/strings.xml
index a8dbc89cbc1..f6fa330d3ed 100644
--- a/app/src/main/res/values-om-rET/strings.xml
+++ b/app/src/main/res/values-om-rET/strings.xml
@@ -329,10 +329,8 @@
   <string name="medicalhistory_question_kidney">Dhukkuba onne</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">Baayyina dhiiga</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">Dhibee Hypertension (Barbaachisa)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">Sukkaara</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">Dhibee Sukkaara (Barbaachisa)</string>
   <string name="newmedicalhistory_next">Kan itti aanu</string>
   <string name="newmedicalhistory_yes">Eeyyee</string>
   <string name="newmedicalhistory_no">Lakki</string>
@@ -674,7 +672,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">Qorannoon Barbaadamaadha</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">Dhiibbaa dhiigaa fii sukkaaraf amaanifuu qorannoo filadhu</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">Dhukkuba Dhiibaa Dhiigaatif filannoo taasisi</string>
   <string name="select_diagnosis_error_ok">Tole</string>
   <string name="sheet_teleconsult_status_title">Tele-consult guutameeraa?</string>
   <string name="sheet_teleconsult_status_yes">Eeyyee</string>
@@ -757,12 +754,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">Boqateera</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">Qorannoo jijjiiri?</string>
-  <string name="change_diagnosis_message">Maaloo dhukkubsataan sukkaara yookan dhiibbaa dhiigaa qaba taanaa EEYYEE irratti mallattoo kaa\'i.</string>
-  <string name="change_diagnosis_positive">JIJJIIRI</string>
-  <string name="change_diagnosis_negative">AMMA MITI</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">Buusuun in kufe</string>
   <string name="overdue_download_notification_failed_subtitle">Yeroo xiqqoo booda shaakalaa</string>
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index b2d3ecbe72c..5ed4da8917f 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">ਗੁਰਦਿਆਂ ਦੀ ਬਿਮਾਰੀ</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">ਹਾਈਪਰਟੈਂਸ਼ਨ</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">ਹਾਈਪਰਟੈਨਸ਼ਨ ਤਖਸ਼ੀਸ਼ (ਲੋੜੀਂਦਾ)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">ਸ਼ੂਗਰ</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">ਡਾਯਬਟੀਜ਼ ਤਖਸ਼ੀਸ਼ (ਲੋੜੀਂਦਾ)</string>
   <string name="newmedicalhistory_next">ਅਗਲਾ</string>
   <string name="newmedicalhistory_yes">ਹਾਂ</string>
   <string name="newmedicalhistory_no">ਨਹੀਂ</string>
@@ -669,7 +667,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">ਡਾਇਗਨੋਸਿਸ ਲੋੜੀਂਦਾ ਹੈ</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">ਹਾਈਪਰਟੈਨਸ਼ਨ ਅਤੇ ਡਾਇਬਿਟੀਜ਼ ਦੋਵਾਂ ਲਈ ਇੱਕ ਨਿਦਾਨ ਦੀ ਚੋਣ ਕਰੋ</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">ਹਾਈਪਰਟੈਨਸ਼ਨ ਲਈ ਇੱਕ ਨਿਦਾਨ ਦੀ ਚੋਣ ਕਰੋ</string>
   <string name="select_diagnosis_error_ok">ਠੀਕ ਹੈ</string>
   <string name="sheet_teleconsult_status_title">ਕੀ ਟੇਲੀ-ਕਨਸਲਟ ਪੂਰੀ ਹੋਈ ਹੈ?</string>
   <string name="sheet_teleconsult_status_yes">ਹਾਂ</string>
@@ -752,12 +749,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">ਮਰ ਗਿਆ</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">ਕੀ ਨਿਦਾਨ ਬਦਲਣਾ ਹੈ?</string>
-  <string name="change_diagnosis_message">ਜੇ ਮਰੀਜ਼ ਨੂੰ ਕਦੇ ਵੀ ਹਾਈਪਰਟੈਨਸ਼ਨ ਜਾਂ ਸ਼ੂਗਰ ਦਾ ਪਤਾ ਲੱਗਿਆ ਹੋਵੇ ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ ਹਾਂ ਨਾਲ ਚਿੰਨ੍ਹਿਤ ਕਰੋ।</string>
-  <string name="change_diagnosis_positive">ਬਦਲੋ</string>
-  <string name="change_diagnosis_negative">ਹਾਲੇ ਨਹੀਂ</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">ਡਾਊਨਲੋਡ ਅਸਫਲ ਰਿਹਾ</string>
   <string name="overdue_download_notification_failed_subtitle">ਕੁਝ ਸਮੇਂ ਬਾਅਦ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml
index cac1e2b977a..f92f049dbdc 100644
--- a/app/src/main/res/values-si-rLK/strings.xml
+++ b/app/src/main/res/values-si-rLK/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">වකුගඩු රෝගය</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">අධි රුධිර පීඩනය</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">අධි රුධිර පීඩන රෝග විනිශ්චය (අවශ්‍යයි)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">දියවැඩියාව</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">දියවැඩියා රෝග විනිශ්චය (අවශ්‍යයි)</string>
   <string name="newmedicalhistory_next">ඊළඟ</string>
   <string name="newmedicalhistory_yes">ඔව්</string>
   <string name="newmedicalhistory_no">නැත</string>
@@ -673,7 +671,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">රෝග නිශ්චය අවශ්‍යයි</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">අධි රුධිර පීඩනය සහ දියවැඩියාව යන රෝග දෙකම සඳහා රෝග විනිශ්චයක් තෝරා ගන්න</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">අධි රුධිර පීඩනය සඳහා රෝග විනිශ්චයක් තෝරන්න</string>
   <string name="select_diagnosis_error_ok">හරි</string>
   <string name="sheet_teleconsult_status_title">ටෙලි-උපදේශනය සම්පූර්ණයි?</string>
   <string name="sheet_teleconsult_status_yes">ඔව්</string>
@@ -756,12 +753,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">මරණය සිදු විය</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">රෝග නිශ්චය වෙනස් කරන්න ද?</string>
-  <string name="change_diagnosis_message">රෝගියාට කිසියම් දිනක අධි රුධිර පීඩනය හෝ දියවැඩියාව ඇති බවට නිශ්චය කර ඇත්නම් ඔව් ලෙස සලකුණු කරන්න.</string>
-  <string name="change_diagnosis_positive">වෙනස් කරන්න</string>
-  <string name="change_diagnosis_negative">දැන් නොවේ</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">බාගැනීම අසාර්ථක විය</string>
   <string name="overdue_download_notification_failed_subtitle">මද වේලාවකින් නැවත උත්සාහ කරන්න</string>
diff --git a/app/src/main/res/values-sid-rET/strings.xml b/app/src/main/res/values-sid-rET/strings.xml
index 6ac58fc17e3..4ff83dc7e65 100644
--- a/app/src/main/res/values-sid-rET/strings.xml
+++ b/app/src/main/res/values-sid-rET/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">Afalete xiso</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">Jawa munideti xiwo</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">Saibbo Mundeete tumo buuxo gara (Hasiissanno)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">Sukarete  xiso</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">Sukkaarete dhibbi buuxo gara (Hasiissanno)</string>
   <string name="newmedicalhistory_next">Aniche</string>
   <string name="newmedicalhistory_yes">E’e</string>
   <string name="newmedicalhistory_no">De’ni</string>
@@ -668,7 +666,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">Mirimaruni  hasanitano</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">Lamuniku xibira yano hypertension and diabetesmirimera dorii</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">Mundeete tumo buuxo gara doori</string>
   <string name="select_diagnosis_error_ok">Mahoye</string>
   <string name="sheet_teleconsult_status_title">Bilibiluni asinani hasawi xorishi eke gofino?</string>
   <string name="sheet_teleconsult_status_yes">E’e</string>
@@ -751,12 +748,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">Reyino</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">Anfoniha xibu dana soora?</string>
-  <string name="change_diagnosis_message">Xisamanchu koni albani Mundete lexa xiso woyimi sukare afantinosiro Yes malate ase</string>
-  <string name="change_diagnosis_positive">Sooro</string>
-  <string name="change_diagnosis_negative">Dixati</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">driisa hoonigoni</string>
   <string name="overdue_download_notification_failed_subtitle">woole yanara wiiro woonali</string>
diff --git a/app/src/main/res/values-so-rET/strings.xml b/app/src/main/res/values-so-rET/strings.xml
index 3cf77d51793..c3d31c53485 100644
--- a/app/src/main/res/values-so-rET/strings.xml
+++ b/app/src/main/res/values-so-rET/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">Cudurada kalyaha</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">Dhiig kar</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">Baaritaanka dhiig karka (Wa loo baahan yahay)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">Sonkorow</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">Baaritaanka sonkorawga (Wa loo baahan yahay)</string>
   <string name="newmedicalhistory_next">Xiga</string>
   <string name="newmedicalhistory_yes">Haa</string>
   <string name="newmedicalhistory_no">Maya</string>
@@ -670,7 +668,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">Baaritaanka ayaa Loo baahanyahay</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">Xullo baaritaanka cudurka dhiig karka iyo sokorowga labadaba</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">Dooro baaritaanka dhiig karka</string>
   <string name="select_diagnosis_error_ok">Haye</string>
   <string name="sheet_teleconsult_status_title">Latalin telefoonka ah ma dhammaystirtay?</string>
   <string name="sheet_teleconsult_status_yes">Haa</string>
@@ -753,12 +750,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">Dhintay</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">Beddel cudur aqoonsasahada?</string>
-  <string name="change_diagnosis_message">Fadaln calaa madee HAA haddii bukaanku weligii lagu aqoonsaday dhiig karka ama cudurka sonkorta.</string>
-  <string name="change_diagnosis_positive">BEDDEL</string>
-  <string name="change_diagnosis_negative">HADDA MAAHA</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">Soo dejinta way Fashilantay</string>
   <string name="overdue_download_notification_failed_subtitle">Isku day mar labbaad qayb wakhtiga ah</string>
diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml
index 4585eed33d2..a9f6a37e27b 100644
--- a/app/src/main/res/values-ta-rIN/strings.xml
+++ b/app/src/main/res/values-ta-rIN/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">சிறுநீரக நோய்</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">உயர் இரத்த அழுத்தம்</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">உயர் இரத்த அழுத்தம் கண்டறிதல் (கட்டாயம்)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">நீரிழிவு</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">நீரிழிவு நோய் கண்டறிதல் (கட்டாயம்)</string>
   <string name="newmedicalhistory_next">அடுத்து</string>
   <string name="newmedicalhistory_yes">ஆம்</string>
   <string name="newmedicalhistory_no">இல்லை</string>
@@ -668,7 +666,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">நோய் கண்டறிதல் அவசியம்</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">உயர் இரத்த அழுத்தம் மற்றும் நீரழிவு நோய் இரண்டிற்குமான நோய் கண்டறிதலைத் தேர்ந்தெடுக்கவும்</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">உயர் இரத்த அழுத்தத்திற்கான நோயறிதலைத் தேர்ந்தெடுக்கவும்</string>
   <string name="select_diagnosis_error_ok">சரி</string>
   <string name="sheet_teleconsult_status_title">தொலைபேசி ஆலோசனை முடிந்ததா?</string>
   <string name="sheet_teleconsult_status_yes">ஆம்</string>
@@ -751,12 +748,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">இறந்துவிட்டார்</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">நோயறிதலை மாற்றவா?</string>
-  <string name="change_diagnosis_message">நோயாளிக்கு எப்போதாவது உயர் இரத்த அழுத்தம் அல்லது நீரிழிவு நோய் இருப்பது கண்டறியப்பட்டால், ஆம் என்று குறிக்கவும்.</string>
-  <string name="change_diagnosis_positive">மாற்று</string>
-  <string name="change_diagnosis_negative">இப்போது வேண்டாம்</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">பதிவிறக்குவது தோல்வி</string>
   <string name="overdue_download_notification_failed_subtitle">கொஞ்சம் நேரம் கழித்து மீண்டும் முயலவும்</string>
diff --git a/app/src/main/res/values-ta-rLK/strings.xml b/app/src/main/res/values-ta-rLK/strings.xml
index 78f26083036..7b91b316a96 100644
--- a/app/src/main/res/values-ta-rLK/strings.xml
+++ b/app/src/main/res/values-ta-rLK/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">சிறுநீரக நோய்</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">உயர் இரத்த அழுத்தம்</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">உயர் இரத்த அழுத்தம் கண்டறிதல் (கட்டாயம்)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">நீரிழிவு நோய்</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">நீரிழிவு நோய் கண்டறிதல் (கட்டாயம்)</string>
   <string name="newmedicalhistory_next">அடுத்தது</string>
   <string name="newmedicalhistory_yes">ஆம்</string>
   <string name="newmedicalhistory_no">இல்லை</string>
@@ -672,7 +670,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">நோய் கண்டறிதல் தேவை</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">உயர் இரத்த அழுத்தம் மற்றும் நீரிழிவு ஆகிய இரண்டிற்குமான நோயறிதல் விவரங்களைத் தேர்ந்தெடுக்கவும்</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">உயர் இரத்த அழுத்தத்திற்கான நோயறிதலைத் தேர்ந்தெடுக்கவும்</string>
   <string name="select_diagnosis_error_ok">சரி</string>
   <string name="sheet_teleconsult_status_title">தொலைத்தொடர்பு ஆலோசனை முடிந்ததா?</string>
   <string name="sheet_teleconsult_status_yes">ஆம்</string>
@@ -755,12 +752,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">இறந்துவிட்டார்</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">நோயறிதலை மாற்றவா?</string>
-  <string name="change_diagnosis_message">நோயாளருக்கு எப்போதாவது உயர் இரத்த அழுத்தம் அல்லது நீரிழிவு நோய் இருப்பது கண்டறியப்பட்டால், ஆம் என்று குறிக்கவும்.</string>
-  <string name="change_diagnosis_positive">மாற்று</string>
-  <string name="change_diagnosis_negative">இப்போது வேண்டாம்</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">பதிவிறக்குவது தோல்வி</string>
   <string name="overdue_download_notification_failed_subtitle">கொஞ்சம் நேரம் கழித்து மீண்டும் முயலவும்</string>
diff --git a/app/src/main/res/values-te-rIN/strings.xml b/app/src/main/res/values-te-rIN/strings.xml
index a8ab24c34da..b5e9b037bce 100644
--- a/app/src/main/res/values-te-rIN/strings.xml
+++ b/app/src/main/res/values-te-rIN/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">మూత్రపిండాల సమస్య</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">అధిక రక్తపోటు</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">రక్తపోటు రోగనిదానము (అవసరం)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">మధుమేహం</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">మధుమేహం రోగనిదానము (అవసరం)</string>
   <string name="newmedicalhistory_next">తదుపరి</string>
   <string name="newmedicalhistory_yes">అవును</string>
   <string name="newmedicalhistory_no">కాదు</string>
@@ -668,7 +666,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">రోగ నిర్ధారణ అవసరం</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">రక్తపోటు మరియు మధుమేహం రెండింటి కోసం రోగ నిర్ధారణను ఎంచుకోండి</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">మధుమేహం కోసం రోగ నిదానమును ఎంచుకోండి</string>
   <string name="select_diagnosis_error_ok">సరే</string>
   <string name="sheet_teleconsult_status_title">టెలి-కన్సల్ట్ పూర్తయ్యిందా?</string>
   <string name="sheet_teleconsult_status_yes">అవును</string>
@@ -751,12 +748,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">మరణించారు</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">రోగ నిర్ణయాన్ని మార్చాలా?</string>
-  <string name="change_diagnosis_message">దయచేసి రోగికి ఎప్పుడైన రక్తపోటు లేదా మధుమేహం ఉన్నట్లయితే అవును అని నిర్ధారించండి.</string>
-  <string name="change_diagnosis_positive">మార్చు</string>
-  <string name="change_diagnosis_negative">ఇప్పుడు వద్దు</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">డౌన్‌లోడ్ విఫలమైంది</string>
   <string name="overdue_download_notification_failed_subtitle">కొద్ది సమయంలో మళ్లీ ప్రయత్నించండి</string>
diff --git a/app/src/main/res/values-ti-rET/strings.xml b/app/src/main/res/values-ti-rET/strings.xml
index 27c1d7dfc0b..2269ee00834 100644
--- a/app/src/main/res/values-ti-rET/strings.xml
+++ b/app/src/main/res/values-ti-rET/strings.xml
@@ -328,10 +328,8 @@
   <string name="medicalhistory_question_kidney">ሕማም ኩሊት</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">ልዑል ፀቕጢ ደም</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">ምርመራ ደም ግፊት(ዘድልይ)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">ሕማም ሽኮርያ</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">ምርመራ ሽኮርያ(ዘድልይ)</string>
   <string name="newmedicalhistory_next">ዝቕፅል</string>
   <string name="newmedicalhistory_yes">እወ</string>
   <string name="newmedicalhistory_no">ኣይፋሉን</string>
@@ -669,7 +667,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">ምርመራ የድሊ</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">ናይ ጸቕጢ-ደምን ናይ ሕማም ሽኮርን ምርመራ ምረጽ</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">ምርመራ ናይ ደም፡ግፊት ክግበረልኩም ይሕረዩ</string>
   <string name="select_diagnosis_error_ok">እሺ</string>
   <string name="sheet_teleconsult_status_title">ቴሌኮንሳልት ተዛዚሙ?</string>
   <string name="sheet_teleconsult_status_yes">እወ</string>
@@ -752,12 +749,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">ሞይቱ/ታ</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">መርመራ ትቕይር\'ዶ?</string>
-  <string name="change_diagnosis_message">እቲ ሕሙም ልዑል ጸቕጢ ደም ወይ ሽኮርያ ከም ዘለዎ ብ መርመራ እንተ ደኣ ተረጋጊጹ ብኽብረትካ አወ ዝብል ምልክት ግበር።</string>
-  <string name="change_diagnosis_positive">ምቕያር</string>
-  <string name="change_diagnosis_negative">ሕጂ ኣይኮነን</string>
-
   <!-- Overdue download notification -->
   <string name="overdue_download_notification_failed_title">ዳውንሎድ ክገብር ወይ ከውርድ ኣይከኣለን</string>
   <string name="overdue_download_notification_failed_subtitle">ካልእ ግዜ ዳግማይ ሞክሩ</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a1e2f4821d7..76520d770a3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -386,10 +386,8 @@
   <string name="medicalhistory_question_kidney">Kidney disease</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_hypertension">Hypertension</string>
-  <string name="medicalhistory_diagnosis_hypertension_required">Hypertension diagnosis (Required)</string>
   <!--suppress UnusedResources -->
   <string name="medicalhistory_diagnosis_diabetes">Diabetes</string>
-  <string name="medicalhistory_diagnosis_diabetes_required">Diabetes diagnosis (Required)</string>
   <string name="newmedicalhistory_next">Next</string>
   <string name="newmedicalhistory_yes">Yes</string>
   <string name="newmedicalhistory_no">No</string>
@@ -773,7 +771,6 @@
   <!-- Select diagnosis error alert dialog -->
   <string name="select_diagnosis_error_diagnosis_required">Diagnosis Required</string>
   <string name="select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes">Select a diagnosis for both hypertension and diabetes</string>
-  <string name="select_diagnosis_error_enter_diagnosis_hypertension">Select a diagnosis for hypertension</string>
   <string name="select_diagnosis_error_ok">OK</string>
   <string name="sheet_teleconsult_status_title">Tele-consult complete?</string>
   <string name="sheet_teleconsult_status_yes">Yes</string>
@@ -867,12 +864,6 @@
   <!-- Patient status view -->
   <string name="patient_status_died">Died</string>
 
-  <!-- Change diagnosis error dialog -->
-  <string name="change_diagnosis_title">Change diagnosis?</string>
-  <string name="change_diagnosis_message">Please mark YES if patient has ever been diagnosed with hypertension or diabetes.</string>
-  <string name="change_diagnosis_positive">CHANGE</string>
-  <string name="change_diagnosis_negative">NOT NOW</string>
-
   <string name="latin_numeric_characters" translatable="false">0123456789</string>
 
   <!-- Overdue download notification -->
diff --git a/app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEffectHandlerTest.kt b/app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEffectHandlerTest.kt
index 8b41c44c9e6..01b9d3b2e37 100644
--- a/app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEffectHandlerTest.kt
+++ b/app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryEffectHandlerTest.kt
@@ -69,66 +69,6 @@ class NewMedicalHistoryEffectHandlerTest {
     verifyNoInteractions(uiActions)
   }
 
-  @Test
-  fun `when show select ongoing hypertension treatment error effect is received, then show ongoing hypertension treatment error dialog`() {
-    // when
-    testCase.dispatch(ShowOngoingHypertensionTreatmentError)
-
-    // then
-    verify(uiActions).showOngoingHypertensionTreatmentErrorDialog()
-    verifyNoMoreInteractions(uiActions)
-
-    testCase.assertNoOutgoingEvents()
-  }
-
-  @Test
-  fun `when show diagnosis required effect is received, then show diagnosis required error dialog`() {
-    // when
-    testCase.dispatch(ShowDiagnosisRequiredError)
-
-    // then
-    verify(uiActions).showDiagnosisRequiredErrorDialog()
-    verifyNoMoreInteractions(uiActions)
-
-    testCase.assertNoOutgoingEvents()
-  }
-
-  @Test
-  fun `when show hypertension diagnosis required effect is received, then show diagnosis required error dialog`() {
-    // when
-    testCase.dispatch(ShowHypertensionDiagnosisRequiredError)
-
-    // then
-    verify(uiActions).showHypertensionDiagnosisRequiredErrorDialog()
-    verifyNoMoreInteractions(uiActions)
-
-    testCase.assertNoOutgoingEvents()
-  }
-
-  @Test
-  fun `when show change diagnosis error effect is received, then show change diagnosis error dialog`() {
-    // when
-    testCase.dispatch(ShowChangeDiagnosisErrorDialog)
-
-    // then
-    verify(uiActions).showChangeDiagnosisErrorDialog()
-    verifyNoMoreInteractions(uiActions)
-
-    testCase.assertNoOutgoingEvents()
-  }
-
-  @Test
-  fun `when show select ongoing diabetes treatment error effect is received, then show ongoing diabetes treatment error dialog`() {
-    // when
-    testCase.dispatch(ShowOngoingDiabetesTreatmentErrorDialog)
-
-    // then
-    verify(uiActions).showOngoingDiabetesTreatmentErrorDialog()
-    verifyNoMoreInteractions(uiActions)
-
-    testCase.assertNoOutgoingEvents()
-  }
-
   @Test
   fun `when back is clicked, then go back to previous screen`() {
     // when
diff --git a/app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdateTest.kt b/app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdateTest.kt
index fb1c63d87e3..369b94b9a16 100644
--- a/app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdateTest.kt
+++ b/app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdateTest.kt
@@ -66,83 +66,6 @@ class NewMedicalHistoryUpdateTest {
         )
   }
 
-  @Test
-  fun `when diabetes management is enabled and the user clicks save, show the diagnosis required error if hypertension diagnosis is not selected`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
-        .answerChanged(DiagnosedWithHypertension, Unanswered)
-        .answerChanged(DiagnosedWithDiabetes, No)
-
-    updateSpec
-        .given(model)
-        .whenEvent(SaveMedicalHistoryClicked())
-        .then(
-            assertThatNext(
-                hasNoModel(),
-                hasEffects(ShowDiagnosisRequiredError)
-            )
-        )
-  }
-
-  @Test
-  fun `when diabetes management is enabled and the user clicks save, show the diagnosis required error if diabetes diagnosis is not selected`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
-        .answerChanged(DiagnosedWithHypertension, Yes)
-        .answerChanged(DiagnosedWithDiabetes, Unanswered)
-        .answerChanged(IsOnHypertensionTreatment(Country.INDIA), No)
-
-    updateSpec
-        .given(model)
-        .whenEvent(SaveMedicalHistoryClicked())
-        .then(
-            assertThatNext(
-                hasNoModel(),
-                hasEffects(ShowDiagnosisRequiredError)
-            )
-        )
-  }
-
-  @Test
-  fun `when diabetes management is enabled and the user clicks save, show the diagnosis required error if both diagnosis are not selected`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
-        .answerChanged(DiagnosedWithHypertension, Unanswered)
-        .answerChanged(DiagnosedWithDiabetes, Unanswered)
-
-    updateSpec
-        .given(model)
-        .whenEvent(SaveMedicalHistoryClicked())
-        .then(
-            assertThatNext(
-                hasNoModel(),
-                hasEffects(ShowDiagnosisRequiredError)
-            )
-        )
-  }
-
-  @Test
-  fun `when diabetes management is disabled and the user clicks save, show diagnosis required error if hypertension diagnosis is not selected`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementDisabled)
-        .answerChanged(DiagnosedWithHypertension, Unanswered)
-        .answerChanged(DiagnosedWithDiabetes, Unanswered)
-
-    updateSpec
-        .given(model)
-        .whenEvent(SaveMedicalHistoryClicked())
-        .then(
-            assertThatNext(
-                hasNoModel(),
-                hasEffects(ShowHypertensionDiagnosisRequiredError)
-            )
-        )
-  }
-
   @Test
   fun `when diabetes management is disabled and the user clicks save, do not show the diagnosis required error if hypertension diagnosis is answered`() {
     val model = defaultModel
@@ -205,26 +128,6 @@ class NewMedicalHistoryUpdateTest {
         )
   }
 
-  @Test
-  fun `when save is clicked and patient is diagnosed with hypertension and ongoing hypertension treatment question is not answered and selected country is india, then show error`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
-        .answerChanged(DiagnosedWithHypertension, Yes)
-        .answerChanged(DiagnosedWithDiabetes, No)
-        .answerChanged(IsOnHypertensionTreatment(Country.INDIA), Unanswered)
-
-    updateSpec
-        .given(model)
-        .whenEvent(SaveMedicalHistoryClicked())
-        .then(
-            assertThatNext(
-                hasNoModel(),
-                hasEffects(ShowOngoingHypertensionTreatmentError)
-            )
-        )
-  }
-
   @Test
   fun `when save is clicked and patient is diagnosed with hypertension and ongoing hypertension treatment question is not answered and selected country is not india, then register patient`() {
     val bangladesh = TestData.country(isoCountryCode = Country.BANGLADESH)
@@ -250,83 +153,6 @@ class NewMedicalHistoryUpdateTest {
         )
   }
 
-  @Test
-  fun `when save is clicked and patient is diagnosed with no hypertension and diabetes, then show change diagnosis dialog`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
-        .answerChanged(DiagnosedWithHypertension, No)
-        .answerChanged(DiagnosedWithDiabetes, No)
-
-    updateSpec
-        .given(model)
-        .whenEvent(SaveMedicalHistoryClicked())
-        .then(
-            assertThatNext(
-                hasModel(model.changeDiagnosisErrorShown()),
-                hasEffects(ShowChangeDiagnosisErrorDialog)
-            )
-        )
-  }
-
-  @Test
-  fun `when save is clicked and patient is diagnosed with no hypertension and diabetes and change diagnosis error is already shown, then don't show change diagnosis dialog`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
-        .answerChanged(DiagnosedWithHypertension, No)
-        .answerChanged(DiagnosedWithDiabetes, No)
-        .changeDiagnosisErrorShown()
-
-    updateSpec
-        .given(model)
-        .whenEvent(SaveMedicalHistoryClicked())
-        .then(
-            assertThatNext(
-                hasModel(model.registeringPatient()),
-                hasEffects(RegisterPatient(model.ongoingMedicalHistoryEntry))
-            )
-        )
-  }
-
-  @Test
-  fun `when change diagnosis not now is clicked, then register patient`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
-        .answerChanged(DiagnosedWithHypertension, No)
-        .answerChanged(DiagnosedWithDiabetes, No)
-
-    updateSpec
-        .given(model)
-        .whenEvent(ChangeDiagnosisNotNowClicked)
-        .then(
-            assertThatNext(
-                hasModel(model.registeringPatient()),
-                hasEffects(RegisterPatient(model.ongoingMedicalHistoryEntry))
-            )
-        )
-  }
-
-  @Test
-  fun `when save is clicked and patient is diagnosed with diabetes and ongoing diabetes treatment question is not answered and selected country is india, then show error`() {
-    val model = defaultModel
-        .ongoingPatientEntryLoaded(patientEntry)
-        .currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
-        .answerChanged(DiagnosedWithHypertension, Yes)
-        .answerChanged(DiagnosedWithDiabetes, Yes)
-        .answerChanged(IsOnHypertensionTreatment(Country.INDIA), Yes)
-        .answerChanged(IsOnDiabetesTreatment, Unanswered)
-
-    updateSpec
-        .given(model)
-        .whenEvent(SaveMedicalHistoryClicked())
-        .then(assertThatNext(
-            hasNoModel(),
-            hasEffects(ShowOngoingDiabetesTreatmentErrorDialog)
-        ))
-  }
-
   @Test
   fun `when save is clicked and diabetes management is disable and patient is diagnosed with diabetes and ongoing diabetes treatment question is not answered and selected country is india, then register patient`() {
     val model = defaultModel