diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_other_income.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_other_income.html.erb
index 018039c01ff..ae4c20ebb87 100644
--- a/components/financial_assistance/app/views/financial_assistance/incomes/_other_income.html.erb
+++ b/components/financial_assistance/app/views/financial_assistance/incomes/_other_income.html.erb
@@ -32,8 +32,8 @@
         </div>
       </div>
       <div class="d-flex mb-2">
-        <a tabindex="0" onkeydown="handleButtonKeyDown(event, 'other-income-delete-<%= dom_id other_income %>')" id="other-income-delete-<%= dom_id other_income %>" class="other-income-delete button outline error mr-2"><%= l10n("faa.edit.remove") %></a>
-        <a tabindex="0" onkeydown="handleButtonKeyDown(event, 'other-income-edit-<%= dom_id other_income %>')" id="other-income-edit-<%= dom_id other_income %>" class="other-income-edit button outline"><%=l10n("edit")%></a>
+        <a tabindex="0" data-keydown-id='other-income-delete-<%= dom_id other_income %>' id="other-income-delete-<%= dom_id other_income %>" class="other-income-delete button outline error mr-2"><%= l10n("faa.edit.remove") %></a>
+        <a tabindex="0" data-keydown-id='other-income-edit-<%= dom_id other_income %>' id="other-income-edit-<%= dom_id other_income %>" class="other-income-edit button outline"><%=l10n("edit")%></a>
       </div>
     </div>
     <div class="edit-other-income-form hidden">
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_other_income_form.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_other_income_form.html.erb
index 871c79241ac..82369c8a926 100644
--- a/components/financial_assistance/app/views/financial_assistance/incomes/_other_income_form.html.erb
+++ b/components/financial_assistance/app/views/financial_assistance/incomes/_other_income_form.html.erb
@@ -4,7 +4,6 @@
     <% income_id = other_income.id %>
     <% new_form = local_assigns[:new_form].present? ? local_assigns[:new_form] : false %>
     <% dummy_income_id = "#{income_id}#{new_form ? 'dummy' : ''}" # needed to prevent Multiple Form Label accessibility error %>
-    <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}', true)") : "" %>
     <div class="my-4">
       <div class="d-flex row income-form-row p-0 m-0 mb-2">
         <%= f.hidden_field :kind, value: kind %>
@@ -31,15 +30,15 @@
         </div>
         <div class="mr-auto col-sm col-md-6 col-lg-3 p-0 pr-4">
           <%= f.label :start_on, l10n("start_date"), class: "required", for: "start_on_#{dummy_income_id}" %>
-          <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", onchange: onchange_date, class: "w-100"  %>
+          <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", class: "w-100"  %>
         </div>
         <div class="col-sm col-md-6 col-lg-3 p-0 pr-4">
           <%= f.label :start_on, l10n("end_date"), for: "end_on_#{dummy_income_id}" %>
-          <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", onchange: onchange_date, class: "w-100 #{'end-on-field' if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning)}" %>
+          <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", class: "w-100 #{'end-on-field' if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning)}" %>
         </div>
       </div>
       <div class="d-flex mb-2">
-        <a tabindex="0" onkeydown="handleButtonKeyDown(event, 'other-income-cancel-<%= income_id %>', 'new-other-income-form')" id="other-income-cancel-<%= income_id %>" class="button outline other-income-cancel mr-2"><%= l10n("cancel") %></a>
+        <a tabindex="0" data-keydown-id='other-income-cancel-<%= income_id %>' id="other-income-cancel-<%= income_id %>" class="button outline other-income-cancel mr-2"><%= l10n("cancel") %></a>
         <%= f.submit l10n("faa.other_incomes.save"), disabled: disabled.present? && disabled ? "disabled" : nil, class: "button", :data => { :cuke => "other-income-save-button" } %>
       </div>
     </div>
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/other.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/other.html.erb
index 2c5ed8246e3..8039c859f30 100755
--- a/components/financial_assistance/app/views/financial_assistance/incomes/other.html.erb
+++ b/components/financial_assistance/app/views/financial_assistance/incomes/other.html.erb
@@ -13,7 +13,7 @@
             <%= radio_button_tag("has_unemployment_income", true, @applicant.has_unemployment_income, class: "required", required: true) %>
             <span class="yes_no_pair"><%= l10n("yes") %></span>
           </label>
-          <label for="has_unemployment_income_false" tabindex="0" onkeydown="handleRadioKeyDown(event, 'has_unemployment_income_false')" class="radio">
+          <label for="has_unemployment_income_false" tabindex="0" data-keydown-id='has_unemployment_income_false' class="radio">
             <%= radio_button_tag("has_unemployment_income", false, @applicant.has_unemployment_income == false, class: "required", required: true) %>
             <span class="yes_no_pair"><%= l10n("no") %></span>
           </label>
@@ -29,7 +29,7 @@
         <% end %>
       </div>
       <div class="<%= 'hidden' unless @applicant.incomes.unemployment.present? %>" id="add-more-link-unemployment">
-        <button tabindex="0" onkeydown="handleButtonKeyDown(event, 'new-unemployment-income')" id="new-unemployment-income" class='new-unemployment-income button'><%= l10n("faa.other_incomes.add", kind: "Unemployment") %></button>
+        <button tabindex="0" data-keydown-id='new-unemployment-income' id="new-unemployment-income" class='new-unemployment-income button'><%= l10n("faa.other_incomes.add", kind: "Unemployment") %></button>
       </div>
       <div id='new-unemployment-income-form' class='new-unemployment-income-form my-4 hidden'>
         <%= render partial: 'financial_assistance/incomes/unemployment_income_form', locals: { income: @applicant.incomes.build(kind: 'unemployment_income'), new_form: true} %>
@@ -47,7 +47,7 @@
           <%= radio_button_tag("has_other_income", true, @applicant.has_other_income, class: "radio", required: true) %>
           <span class="yes_no_pair"><%= l10n("yes") %></span>
         </label>
-        <label for="has_other_income_false" tabindex="0" onkeydown="handleRadioKeyDown(event, 'has_other_income_false')" class="radio">
+        <label for="has_other_income_false" tabindex="0" data-keydown-id='has_other_income_false' class="radio">
           <%= radio_button_tag("has_other_income", false, @applicant.has_other_income == false, class: "required", required: true) %>
           <span class="yes_no_pair"><%= l10n("no") %></span>
         </label>
@@ -76,7 +76,7 @@
           <% end %>
         </div>
         <div class="add-more-link mt-4 <%= 'hidden' unless @applicant.incomes.of_kind(other_income_kind).present? %>" id="add-more-link-<%=other_income_kind%>">
-          <button tabindex="0" onkeydown="handleButtonKeyDown(event, 'add_new_other_income_kind')" class='add_new_other_income_kind button'><%= l10n("faa.other_incomes.add", kind: label.chomp(' income')).titleize %></button>
+          <button tabindex="0" data-keydown-id='add_new_other_income_kind' id="add_new_other_income_kind" class='add_new_other_income_kind button'><%= l10n("faa.other_incomes.add", kind: label.chomp(' income')).titleize %></button>
         </div>
         <div id="new-other-income-form" class='new-other-income-form hidden <%= other_income_kind %>'>
           <%= render partial: 'financial_assistance/incomes/other_income_form', locals: { other_income: FinancialAssistance::Income.new, kind: other_income_kind, disabled: true, new_form: true} %>
@@ -96,7 +96,7 @@
             <%= radio_button_tag("has_american_indian_alaskan_native_income", true, @applicant.has_american_indian_alaskan_native_income, class: "required", required: true) %>
             <span class="yes_no_pair"><%= l10n("yes") %></span>
           </label>
-          <label for="has_american_indian_alaskan_native_income_false" tabindex="0" onkeydown="handleRadioKeyDown(event, 'has_american_indian_alaskan_native_income_false')" class="radio">
+          <label for="has_american_indian_alaskan_native_income_false" tabindex="0" data-keydown-id='has_american_indian_alaskan_native_income_false' class="radio">
             <%= radio_button_tag("has_american_indian_alaskan_native_income", false, @applicant.has_american_indian_alaskan_native_income == false, class: "required", required: true) %>
             <span class="yes_no_pair"><%= l10n("no") %></span>
           </label>
@@ -112,7 +112,7 @@
         <% end %>
       </div>
       <div class="mt-4 <%= 'hidden' unless @applicant.incomes.american_indian_and_alaskan_native.present? %>" id="add-more-link-ai">
-        <button tabindex="0" onkeydown="handleButtonKeyDown(event, 'new-ai-an-income')" id="new-ai-an-income" class="button"><%= l10n("faa.other_incomes.add", kind: "American Indian/Alaskan Native") %></button>
+        <button tabindex="0" data-keydown-id='new-ai-an-income' id="new-ai-an-income" class="button"><%= l10n("faa.other_incomes.add", kind: "American Indian/Alaskan Native") %></button>
       </div>
       <div class='new-ai-an-income-form hidden'>
         <%= render partial: 'financial_assistance/incomes/ai_an_income_form', locals: { income: @applicant.incomes.build(kind: 'american_indian_and_alaskan_native'), new_form: true } %>