diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py
index 0be94a8f9..c71f5c65c 100644
--- a/netbox/circuits/forms/filtersets.py
+++ b/netbox/circuits/forms/filtersets.py
@@ -15,7 +15,6 @@ from utilities.forms import add_blank_choice
 from utilities.forms.fields import ColorField, DynamicModelMultipleChoiceField, TagFilterField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import DatePicker, NumberWithOptions
-from circuits.filtersets import *
 
 __all__ = (
     'CircuitFilterForm',
@@ -324,11 +323,7 @@ class VirtualCircuitTypeFilterForm(OrganizationalModelFilterSetForm):
     )
 
 
-class VirtualCircuitFilterForm(
-    TenancyFilterForm,
-    ContactModelFilterForm,
-    PrimaryModelFilterSetForm
-):
+class VirtualCircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilterSetForm):
     model = VirtualCircuit
     fieldsets = (
         FieldSet('q', 'filter_id', 'tag', 'owner_id'),
diff --git a/netbox/core/forms/filtersets.py b/netbox/core/forms/filtersets.py
index 4e413cf63..69e6a4fbb 100644
--- a/netbox/core/forms/filtersets.py
+++ b/netbox/core/forms/filtersets.py
@@ -13,7 +13,6 @@ from utilities.forms.fields import (
 )
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import DateTimePicker
-from core.filtersets import *
 
 __all__ = (
     'ConfigRevisionFilterForm',
diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py
index 859fce99b..9e0ee4780 100644
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -3,7 +3,6 @@ from django.utils.translation import gettext_lazy as _
 
 from dcim.choices import *
 from dcim.constants import *
-from dcim.filtersets import *
 from dcim.models import *
 from extras.forms import LocalConfigContextFilterForm
 from extras.models import ConfigTemplate
diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py
index 9618f1c6e..85b0f825d 100644
--- a/netbox/ipam/forms/filtersets.py
+++ b/netbox/ipam/forms/filtersets.py
@@ -4,7 +4,6 @@ from django.utils.translation import gettext_lazy as _
 from dcim.models import Location, Rack, Region, Site, SiteGroup, Device
 from ipam.choices import *
 from ipam.constants import *
-from ipam.filtersets import *
 from ipam.models import *
 from netbox.forms import NetBoxModelFilterSetForm, OrganizationalModelFilterSetForm, PrimaryModelFilterSetForm
 from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
diff --git a/netbox/tenancy/forms/filtersets.py b/netbox/tenancy/forms/filtersets.py
index 58bcdf0ca..239a765c6 100644
--- a/netbox/tenancy/forms/filtersets.py
+++ b/netbox/tenancy/forms/filtersets.py
@@ -7,7 +7,6 @@ from netbox.forms import (
     PrimaryModelFilterSetForm,
 )
 from tenancy.choices import *
-from tenancy.filtersets import *
 from tenancy.models import *
 from tenancy.forms import ContactModelFilterForm
 from utilities.forms.fields import (
diff --git a/netbox/users/forms/filtersets.py b/netbox/users/forms/filtersets.py
index f167a1a06..13502dc65 100644
--- a/netbox/users/forms/filtersets.py
+++ b/netbox/users/forms/filtersets.py
@@ -10,7 +10,6 @@ from utilities.forms.fields import DynamicModelMultipleChoiceField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.utils import add_blank_choice
 from utilities.forms.widgets import DateTimePicker
-from users.filtersets import *
 
 __all__ = (
     'GroupFilterForm',
diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py
index 30e78cc58..27fda4a85 100644
--- a/netbox/virtualization/forms/filtersets.py
+++ b/netbox/virtualization/forms/filtersets.py
@@ -13,7 +13,6 @@ from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
 from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField, TagFilterField
 from utilities.forms.rendering import FieldSet
 from virtualization.choices import *
-from virtualization.filtersets import *
 from virtualization.models import *
 from vpn.models import L2VPN
 
diff --git a/netbox/vpn/forms/filtersets.py b/netbox/vpn/forms/filtersets.py
index 687144a50..6108b1389 100644
--- a/netbox/vpn/forms/filtersets.py
+++ b/netbox/vpn/forms/filtersets.py
@@ -14,7 +14,6 @@ from utilities.forms.utils import add_blank_choice
 from virtualization.models import VirtualMachine
 from vpn.choices import *
 from vpn.constants import L2VPN_ASSIGNMENT_MODELS
-from vpn.filtersets import *
 from vpn.models import *
 
 __all__ = (
diff --git a/netbox/wireless/forms/filtersets.py b/netbox/wireless/forms/filtersets.py
index 1635c251c..171a7d8b6 100644
--- a/netbox/wireless/forms/filtersets.py
+++ b/netbox/wireless/forms/filtersets.py
@@ -10,7 +10,6 @@ from utilities.forms import add_blank_choice
 from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField
 from utilities.forms.rendering import FieldSet
 from wireless.choices import *
-from wireless.filtersets import *
 from wireless.models import *
 
 __all__ = (