diff --git a/addons/hr/static/src/views/form_view.js b/addons/hr/static/src/views/form_view.js
index 581fbac5a78..76160a5e80d 100644
--- a/addons/hr/static/src/views/form_view.js
+++ b/addons/hr/static/src/views/form_view.js
@@ -4,10 +4,8 @@ import { registry } from "@web/core/registry";
 
 import { formView } from "@web/views/form/form_view";
 import { FormController } from "@web/views/form/form_controller";
-import { FormRenderer } from "@web/views/form/form_renderer";
 
 import { useArchiveEmployee } from "@hr/views/archive_employee_hook";
-import { useOpenChat } from "@mail/core/web/open_chat_hook";
 
 export class EmployeeFormController extends FormController {
     setup() {
@@ -22,16 +20,7 @@ export class EmployeeFormController extends FormController {
     }
 }
 
-// TODO KBA: to remove in master
-export class EmployeeFormRenderer extends FormRenderer {
-    setup() {
-        super.setup();
-        this.openChat = useOpenChat(this.props.record.resModel);
-    }
-}
-
 registry.category("views").add("hr_employee_form", {
     ...formView,
     Controller: EmployeeFormController,
-    Renderer: EmployeeFormRenderer,
 });
diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py
index 2918b7ba57a..9c8a8177930 100644
--- a/addons/hr_holidays/models/hr_leave.py
+++ b/addons/hr_holidays/models/hr_leave.py
@@ -324,12 +324,6 @@ class HolidaysRequest(models.Model):
         for leave in self:
             leave.all_employee_ids = leave.employee_id | leave.employee_ids
 
-    @api.constrains('holiday_status_id', 'number_of_days')
-    def _check_allocation_duration(self):
-        # Deprecated as part of https://github.com/odoo/odoo/pull/96545
-        # TODO: remove in master
-        return
-
     @api.depends_context('uid')
     def _compute_description(self):
         self.check_access_rights('read')
@@ -365,12 +359,6 @@ class HolidaysRequest(models.Model):
         for leave in self:
             leave.state = 'confirm' if leave.validation_type != 'no_validation' else 'draft'
 
-    @api.depends('holiday_status_id.requires_allocation', 'validation_type', 'employee_id', 'date_from', 'date_to')
-    def _compute_from_holiday_status_id(self):
-        # Deprecated as part of https://github.com/odoo/odoo/pull/96545
-        # TODO: remove in master
-        self.holiday_allocation_id = False
-
     @api.depends('request_date_from_period', 'request_hour_from', 'request_hour_to', 'request_date_from', 'request_date_to',
                  'request_unit_half', 'request_unit_hours', 'employee_id')
     def _compute_date_from_to(self):
@@ -893,18 +881,6 @@ class HolidaysRequest(models.Model):
         if employee.user_id:
             self.message_subscribe(partner_ids=employee.user_id.partner_id.ids)
 
-    @api.constrains('holiday_allocation_id')
-    def _check_allocation_id(self):
-        # Deprecated as part of https://github.com/odoo/odoo/pull/96545
-        # TODO: remove in master
-        return
-
-    @api.constrains('holiday_allocation_id', 'date_to', 'date_from')
-    def _check_leave_type_validity(self):
-        # Deprecated as part of https://github.com/odoo/odoo/pull/96545
-        # TODO: remove in master
-        return
-
     @api.constrains('date_from', 'date_to')
     def _check_stress_day(self):
         is_leave_user = self.user_has_groups('hr_holidays.group_hr_holidays_user')
diff --git a/addons/hr_holidays/tests/test_leave_requests.py b/addons/hr_holidays/tests/test_leave_requests.py
index d9a77f8df9d..ebff50fcc8a 100644
--- a/addons/hr_holidays/tests/test_leave_requests.py
+++ b/addons/hr_holidays/tests/test_leave_requests.py
@@ -119,12 +119,6 @@ class TestLeaveRequests(TestHrHolidaysCommon):
                 'number_of_days': 1,
             })
 
-    @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
-    def test_limited_type_no_days(self):
-        # Deprecated as part of https://github.com/odoo/odoo/pull/96545
-        # TODO: remove in master
-        return
-
     @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
     def test_limited_type_days_left(self):
         """  Employee creates a leave request in a limited category and has enough days left  """
@@ -182,12 +176,6 @@ class TestLeaveRequests(TestHrHolidaysCommon):
             'number_of_days': 1,
         })
 
-    @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
-    def test_accrual_validity_time_not_valid(self):
-        # Deprecated as part of https://github.com/odoo/odoo/pull/96545
-        # TODO: remove in master
-        return
-
     @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
     def test_department_leave(self):
         """ Create a department leave """