diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 4a7e9eca5..0bb6658a2 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1062,7 +1062,6 @@ class DeviceListView(PermissionRequiredMixin, ObjectListView):
     filterset = filters.DeviceFilterSet
     filterset_form = forms.DeviceFilterForm
     table = tables.DeviceDetailTable
-    # TODO: Remove custom template
     template_name = 'dcim/device_list.html'
 
 
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 36d757b6a..053098f0b 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -186,7 +186,6 @@ class RIRListView(PermissionRequiredMixin, ObjectListView):
     filterset = filters.RIRFilterSet
     filterset_form = forms.RIRFilterForm
     table = tables.RIRDetailTable
-    # TODO: Remove custom template
     template_name = 'ipam/rir_list.html'
 
     def alter_queryset(self, request):
@@ -296,7 +295,6 @@ class AggregateListView(PermissionRequiredMixin, ObjectListView):
     filterset = filters.AggregateFilterSet
     filterset_form = forms.AggregateFilterForm
     table = tables.AggregateDetailTable
-    # TODO: Remove custom template
     template_name = 'ipam/aggregate_list.html'
 
     def extra_context(self):
@@ -448,7 +446,6 @@ class PrefixListView(PermissionRequiredMixin, ObjectListView):
     filterset = filters.PrefixFilterSet
     filterset_form = forms.PrefixFilterForm
     table = tables.PrefixDetailTable
-    # TODO: Remove custom template
     template_name = 'ipam/prefix_list.html'
 
     def alter_queryset(self, request):
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index e6292ba7d..291392eb4 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -254,7 +254,6 @@ class VirtualMachineListView(PermissionRequiredMixin, ObjectListView):
     filterset = filters.VirtualMachineFilterSet
     filterset_form = forms.VirtualMachineFilterForm
     table = tables.VirtualMachineDetailTable
-    # TODO: Remove custom template
     template_name = 'virtualization/virtualmachine_list.html'