diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
index d1b0f1294..426e57235 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
@@ -54,12 +54,12 @@
                            id="@Model.DayId"
                            name="@Model.DayId"
                            value="@Model.DayValue"
-                           type="text"
+                           type="number"
+                           pattern="[0-9]*"
                            min="1"
                            max="31"
                            step="1"
-                           inputmode="numeric"
-                           aria-describedby="date-error" aria-invalid="false" />
+                           inputmode="numeric" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -69,12 +69,12 @@
                            id="@Model.MonthId"
                            name="@Model.MonthId"
                            value="@Model.MonthValue"
-                           type="text"
+                           type="number"
+                           pattern="[0-9]*"
                            min="1"
                            max="12"
                            step="1"
-                           inputmode="numeric"
-                           aria-describedby="date-error" aria-invalid="false" />
+                           inputmode="numeric" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -84,16 +84,14 @@
                            id="@Model.YearId"
                            name="@Model.YearId"
                            value="@Model.YearValue"
-                           type="text"
+                           type="number"
+                           pattern="[0-9]*"
                            min="1900"
                            max="9999"
                            step="1"
-                           inputmode="numeric"
-                           aria-describedby="date-error" aria-invalid="false" />
+                           inputmode="numeric" />
                 </div>
             </div>
-            <span id="date-error" class="error-message--margin-bottom-1 nhsuk-error-message" aria-live="polite" style="visibility: hidden;">
-            </span>
         </div>
     </fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
index 7f438d581..269b174f8 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
@@ -21,10 +21,6 @@
             </ul>
         </div>
     </div>
-    <script>
-        const errorSummary = document.querySelector("#error-summary-title").parentElement;
-        errorSummary.focus();
-    </script>
 }
 else
 {
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
index 2bcd6dae9..05eb26699 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
@@ -44,7 +44,7 @@
 
         @if (Model.Required && !Model.HasError)
         {
-            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3" aria-live="assertive" role="alert">
+            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
             </div>
         }
 
@@ -131,19 +131,5 @@
 
         </div>
     </fieldset>
-    <script>
-        window.onload = function() {
-            const id = "@Model.AspFor";
-            const radioForm = document.querySelector("main form[novalidate='novalidate']");
-            radioForm.addEventListener("submit", () => {
-                const errorMessageParent = document.querySelector("div[data-valmsg-for='" + id + "']");
-                const errorMessage = errorMessageParent.innerHTML;
-                errorMessageParent.innerHTML = "";
 
-                setTimeout(function () {
-                    errorMessageParent.innerHTML = errorMessage;
-                }, 0);
-            });
-        };
-    </script>
 </div>
\ No newline at end of file