diff --git a/devstack/lib/ml2 b/devstack/lib/ml2
index a5b55bd08c5..5d40f50e6f8 100644
--- a/devstack/lib/ml2
+++ b/devstack/lib/ml2
@@ -1,6 +1,6 @@
 function configure_ml2_extension_drivers {
     if is_neutron_legacy_enabled; then
-        # NOTE(yamamoto): This overwrites what neutron-legacy set,
+        # NOTE(yamamoto): This overwrites what Devstack's neutron module set,
         # with the latest set of drivers.
         # While we modifies Q_ML2_PLUGIN_EXT_DRIVERS (via
         # neutron_ml2_extension_driver_add calls) in the post-config phase,
diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml
index 3aed1a3035e..e27c1aa186f 100644
--- a/zuul.d/grenade.yaml
+++ b/zuul.d/grenade.yaml
@@ -148,9 +148,6 @@
           $NEUTRON_CONF:
             DEFAULT:
               router_distributed: True
-          # NOTE(slaweq): We can get rid of this hardcoded absolute path when
-          # devstack-tempest job will be switched to use lib/neutron instead of
-          # lib/neutron-legacy
           "/$NEUTRON_CORE_PLUGIN_CONF":
             ml2:
               mechanism_drivers: openvswitch,l2population
@@ -197,9 +194,6 @@
             $NEUTRON_CONF:
               DEFAULT:
                 router_distributed: True
-            # NOTE(slaweq): We can get rid of this hardcoded absolute path when
-            # devstack-tempest job will be switched to use lib/neutron instead of
-            # lib/neutron-legacy
             "/$NEUTRON_CORE_PLUGIN_CONF":
               agent:
                 enable_distributed_routing: True
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index ce1d49454fc..bf39613e105 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -83,9 +83,6 @@
             DEFAULT:
               router_distributed: True
               l3_ha: True
-          # NOTE(slaweq): We can get rid of this hardcoded absolute path when
-          # devstack-tempest job will be switched to use lib/neutron instead of
-          # lib/neutron-legacy
           "/$NEUTRON_CORE_PLUGIN_CONF":
             ml2:
               mechanism_drivers: openvswitch,l2population
@@ -141,9 +138,6 @@
             $NEUTRON_CONF:
               DEFAULT:
                 router_distributed: True
-            # NOTE(slaweq): We can get rid of this hardcoded absolute path when
-            # devstack-tempest job will be switched to use lib/neutron instead of
-            # lib/neutron-legacy
             "/$NEUTRON_CORE_PLUGIN_CONF":
               agent:
                 enable_distributed_routing: True
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 26d6951a258..9766cb09e6d 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -171,9 +171,6 @@
               quota_floatingip: 500
               quota_security_group: 100
               quota_security_group_rule: 1000
-          # NOTE(slaweq): We can get rid of this hardcoded absolute path when
-          # devstack-tempest job will be switched to use lib/neutron instead of
-          # lib/neutron-legacy
           "/$NEUTRON_CORE_PLUGIN_CONF":
             ml2_type_vlan:
               network_vlan_ranges: foo:1:10