diff --git a/addons/hr_work_entry_contract/models/hr_contract.py b/addons/hr_work_entry_contract/models/hr_contract.py
index 3b6d4b30b5d..dd6688555f1 100644
--- a/addons/hr_work_entry_contract/models/hr_contract.py
+++ b/addons/hr_work_entry_contract/models/hr_contract.py
@@ -148,8 +148,6 @@ class HrContract(models.Model):
 
             # Other calendars: In case the employee has declared time off in another calendar
             # Example: Take a time off, then a credit time.
-            # YTI TODO: This mimics the behavior of _leave_intervals_batch, while waiting to be cleaned
-            # in master.
             resources_list = [self.env['resource.resource'], resource]
             result = defaultdict(lambda: [])
             for leave in itertools.chain(leaves_by_resource[False], leaves_by_resource[resource.id]):
diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 2d6ef6d684e..6b850ba296d 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -1389,7 +1389,6 @@ class ProductTemplate(models.Model):
 
     def _get_contextual_price(self, product=None):
         self.ensure_one()
-        # YTI TODO: During website_sale cleaning, we should get rid of those crappy context thing
         pricelist = self._get_contextual_pricelist()
         quantity = self.env.context.get('quantity', 1.0)
         uom = self.env['uom.uom'].browse(self.env.context.get('uom'))
diff --git a/addons/website_sale_comparison/tests/test_website_sale_comparison.py b/addons/website_sale_comparison/tests/test_website_sale_comparison.py
index 527b8ec6428..50899faf7ee 100644
--- a/addons/website_sale_comparison/tests/test_website_sale_comparison.py
+++ b/addons/website_sale_comparison/tests/test_website_sale_comparison.py
@@ -18,12 +18,6 @@ class TestWebsiteSaleComparison(odoo.tests.TransactionCase):
         `_remove_copied_views`. The problematic view that has to be removed is
         `product_attributes_body` because it has a reference to `add_to_compare`.
         """
-        # YTI TODO: Adapt this tour without demo data
-        # I still didn't figure why, but this test freezes on runbot
-        # without the demo data
-        if tools.config["without_demo"]:
-            return
-
         Website0 = self.env['website'].with_context(website_id=None)
         Website1 = self.env['website'].with_context(website_id=1)
 
diff --git a/odoo/addons/base/tests/common.py b/odoo/addons/base/tests/common.py
index 1e20d0416cf..014a6365bcb 100644
--- a/odoo/addons/base/tests/common.py
+++ b/odoo/addons/base/tests/common.py
@@ -91,7 +91,6 @@ class TransactionCaseWithUserDemo(TransactionCase):
 
         if not cls.user_demo:
             cls.env['ir.config_parameter'].sudo().set_param('auth_password_policy.minlength', 4)
-            # YTI TODO: This could be factorized between the different classes
             cls.partner_demo = cls.env['res.partner'].create({
                 'name': 'Marc Demo',
                 'email': 'mark.brown23@example.com',