From 60661ab639c07531cd2ae23729e3b9ece4a74852 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Thu, 30 Mar 2023 14:00:37 -0400
Subject: [PATCH] Clean up errant changes

---
 netbox/dcim/choices.py             | 4 ++--
 netbox/dcim/forms/bulk_edit.py     | 4 ----
 netbox/dcim/views.py               | 2 +-
 netbox/tenancy/forms/filtersets.py | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py
index d89210b6b..ad196a69e 100644
--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -1438,10 +1438,10 @@ class PowerFeedTypeChoices(ChoiceSet):
     TYPE_PRIMARY = 'primary'
     TYPE_REDUNDANT = 'redundant'
 
-    CHOICES = [
+    CHOICES = (
         (TYPE_PRIMARY, 'Primary', 'green'),
         (TYPE_REDUNDANT, 'Redundant', 'cyan'),
-    ]
+    )
 
 
 class PowerFeedSupplyChoices(ChoiceSet):
diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py
index 888718642..1a5257165 100644
--- a/netbox/dcim/forms/bulk_edit.py
+++ b/netbox/dcim/forms/bulk_edit.py
@@ -901,10 +901,6 @@ class InterfaceTemplateBulkEditForm(BulkEditForm):
         required=False,
         widget=BulkEditNullBooleanSelect
     )
-    enabled = forms.NullBooleanField(
-        required=False,
-        widget=BulkEditNullBooleanSelect
-    )
     mgmt_only = forms.NullBooleanField(
         required=False,
         widget=BulkEditNullBooleanSelect,
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index a43a70c3c..9cf50713f 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -16,7 +16,7 @@ from jinja2.exceptions import TemplateError
 
 from circuits.models import Circuit, CircuitTermination
 from extras.views import ObjectConfigContextView
-from ipam.models import ASN, IPAddress, Prefix, Service, VLAN, VLANGroup
+from ipam.models import ASN, IPAddress, Prefix, VLAN, VLANGroup
 from ipam.tables import InterfaceVLANTable
 from netbox.views import generic
 from utilities.forms import ConfirmationForm
diff --git a/netbox/tenancy/forms/filtersets.py b/netbox/tenancy/forms/filtersets.py
index 3acd6e341..626d26785 100644
--- a/netbox/tenancy/forms/filtersets.py
+++ b/netbox/tenancy/forms/filtersets.py
@@ -8,7 +8,7 @@ from tenancy.choices import *
 from tenancy.models import *
 from tenancy.forms import ContactModelFilterForm
 from utilities.forms.fields import (
-    ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, MultipleChoiceField, TagFilterField,
+    ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, TagFilterField,
 )
 
 __all__ = (