diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py
index 66f209b40f2..2d72154e76c 100644
--- a/addons/hr_holidays/models/hr_leave.py
+++ b/addons/hr_holidays/models/hr_leave.py
@@ -330,16 +330,12 @@ class HolidaysRequest(models.Model):
             raise UserError(_('Leave request must be in Draft state ("To Submit") in order to confirm it.'))
         return self.write({'state': 'confirm'})
 
-    @api.multi
-    def _check_security_action_approve(self):
-        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
-            raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
-
     @api.multi
     def action_approve(self):
         # if double_validation: this method is the first approval approval
         # if not double_validation: this method calls action_validate() below
-        self._check_security_action_approve()
+        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
+            raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
 
         current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
         if any(holiday.state != 'confirm' for holiday in self):
@@ -350,14 +346,10 @@ class HolidaysRequest(models.Model):
         return True
 
     @api.multi
-    def _check_security_action_validate(self):
+    def action_validate(self):
         if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
             raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
 
-    @api.multi
-    def action_validate(self):
-        self._check_security_action_validate()
-
         current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
         for holiday in self:
             if holiday.state not in ['confirm', 'validate1']:
@@ -386,7 +378,8 @@ class HolidaysRequest(models.Model):
 
     @api.multi
     def action_refuse(self):
-        self._check_security_action_refuse()
+        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
+            raise UserError(_('Only an HR Officer or Manager can refuse leave requests.'))
 
         current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
         for holiday in self:
@@ -405,11 +398,6 @@ class HolidaysRequest(models.Model):
         self._remove_resource_leave()
         return True
 
-    @api.multi
-    def _check_security_action_refuse(self):
-        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
-            raise UserError(_('Only an HR Officer or Manager can refuse leave requests.'))
-
     ####################################################
     # Messaging methods
     ####################################################
diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py
index da1260fffef..a1fa77e0730 100644
--- a/addons/hr_holidays/models/hr_leave_allocation.py
+++ b/addons/hr_holidays/models/hr_leave_allocation.py
@@ -189,16 +189,12 @@ class HolidaysAllocation(models.Model):
             raise UserError(_('Leave request must be in Draft state ("To Submit") in order to confirm it.'))
         return self.write({'state': 'confirm'})
 
-    @api.multi
-    def _check_security_action_approve(self):
-        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
-            raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
-
     @api.multi
     def action_approve(self):
         # if double_validation: this method is the first approval approval
         # if not double_validation: this method calls action_validate() below
-        self._check_security_action_approve()
+        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
+            raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
 
         current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
         if any(holiday.state != 'confirm' for holiday in self):
@@ -209,14 +205,10 @@ class HolidaysAllocation(models.Model):
         return True
 
     @api.multi
-    def _check_security_action_validate(self):
+    def action_validate(self):
         if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
             raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
 
-    @api.multi
-    def action_validate(self):
-        self._check_security_action_validate()
-
         current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
         for holiday in self:
             if holiday.state not in ['confirm', 'validate1']:
@@ -243,7 +235,8 @@ class HolidaysAllocation(models.Model):
 
     @api.multi
     def action_refuse(self):
-        self._check_security_action_refuse()
+        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
+            raise UserError(_('Only an HR Officer or Manager can refuse leave requests.'))
 
         current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
         for holiday in self:
@@ -258,11 +251,6 @@ class HolidaysAllocation(models.Model):
             holiday.linked_request_ids.action_refuse()
         return True
 
-    @api.multi
-    def _check_security_action_refuse(self):
-        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
-            raise UserError(_('Only an HR Officer or Manager can refuse leave requests.'))
-
     ####################################################
     # Messaging methods
     ####################################################
diff --git a/addons/project_timesheet_holidays/models/account_analytic.py b/addons/project_timesheet_holidays/models/account_analytic.py
index 0fd5788df3d..d9e8896aa5c 100644
--- a/addons/project_timesheet_holidays/models/account_analytic.py
+++ b/addons/project_timesheet_holidays/models/account_analytic.py
@@ -8,7 +8,6 @@ from odoo.exceptions import UserError
 class AccountAnalyticLine(models.Model):
     _inherit = 'account.analytic.line'
 
-    # TODO: See if it is the right type
     holiday_id = fields.Many2one("hr.leave", string='Leave Request')
 
     @api.multi