diff --git a/netbox/dcim/graphql/enums.py b/netbox/dcim/graphql/enums.py
index 2e99ab5e99..0b3441d529 100644
--- a/netbox/dcim/graphql/enums.py
+++ b/netbox/dcim/graphql/enums.py
@@ -131,8 +131,6 @@ class DeviceAirflowEnum(Enum):
 
 @strawberry.enum
 class ModuleStatusEnum(Enum):
-    key = 'Module.status'
-
     STATUS_OFFLINE = 'offline'
     STATUS_ACTIVE = 'active'
     STATUS_PLANNED = 'planned'
@@ -800,8 +798,6 @@ class CableEndEnum(Enum):
 
 @strawberry.enum
 class PowerFeedStatusEnum(Enum):
-    key = 'PowerFeed.status'
-
     STATUS_OFFLINE = 'offline'
     STATUS_ACTIVE = 'active'
     STATUS_PLANNED = 'planned'
@@ -810,7 +806,6 @@ class PowerFeedStatusEnum(Enum):
 
 @strawberry.enum
 class PowerFeedTypeEnum(Enum):
-
     TYPE_PRIMARY = 'primary'
     TYPE_REDUNDANT = 'redundant'
 
@@ -834,8 +829,6 @@ class PowerFeedPhaseEnum(Enum):
 #
 @strawberry.enum
 class VirtualDeviceContextStatusEnum(Enum):
-    key = 'VirtualDeviceContext.status'
-
     STATUS_ACTIVE = 'active'
     STATUS_PLANNED = 'planned'
     STATUS_OFFLINE = 'offline'
@@ -847,8 +840,6 @@ class VirtualDeviceContextStatusEnum(Enum):
 
 @strawberry.enum
 class InventoryItemStatusEnum(Enum):
-    key = 'InventoryItem.status'
-
     STATUS_OFFLINE = 'offline'
     STATUS_ACTIVE = 'active'
     STATUS_PLANNED = 'planned'
diff --git a/netbox/extras/graphql/enums.py b/netbox/extras/graphql/enums.py
index 959314d9e2..1e44e91913 100644
--- a/netbox/extras/graphql/enums.py
+++ b/netbox/extras/graphql/enums.py
@@ -98,8 +98,6 @@ class BookmarkOrderingEnum(Enum):
 
 @strawberry.enum
 class JournalEntryKindEnum(Enum):
-    key = 'JournalEntry.kind'
-
     KIND_INFO = 'info'
     KIND_SUCCESS = 'success'
     KIND_WARNING = 'warning'
diff --git a/netbox/ipam/graphql/enums.py b/netbox/ipam/graphql/enums.py
index 3e73773cb5..b812548807 100644
--- a/netbox/ipam/graphql/enums.py
+++ b/netbox/ipam/graphql/enums.py
@@ -28,8 +28,6 @@ class IPAddressFamilyEnum(Enum):
 
 @strawberry.enum
 class PrefixStatusEnum(Enum):
-    key = 'Prefix.status'
-
     STATUS_CONTAINER = 'container'
     STATUS_ACTIVE = 'active'
     STATUS_RESERVED = 'reserved'
@@ -43,8 +41,6 @@ class PrefixStatusEnum(Enum):
 
 @strawberry.enum
 class IPRangeStatusEnum(Enum):
-    key = 'IPRange.status'
-
     STATUS_ACTIVE = 'active'
     STATUS_RESERVED = 'reserved'
     STATUS_DEPRECATED = 'deprecated'
@@ -57,8 +53,6 @@ class IPRangeStatusEnum(Enum):
 
 @strawberry.enum
 class IPAddressStatusEnum(Enum):
-    key = 'IPAddress.status'
-
     STATUS_ACTIVE = 'active'
     STATUS_RESERVED = 'reserved'
     STATUS_DEPRECATED = 'deprecated'
@@ -107,8 +101,6 @@ class FHRPGroupAuthTypeEnum(Enum):
 
 @strawberry.enum
 class VLANStatusEnum(Enum):
-    key = 'VLAN.status'
-
     STATUS_ACTIVE = 'active'
     STATUS_RESERVED = 'reserved'
     STATUS_DEPRECATED = 'deprecated'
@@ -119,7 +111,6 @@ class VLANQinQRoleEnum(Enum):
     ROLE_SERVICE = 'svlan'
     ROLE_CUSTOMER = 'cvlan'
 
-
 #
 # Services
 #
diff --git a/netbox/netbox/graphql/schema.py b/netbox/netbox/graphql/schema.py
index 625f7cd1b2..a7609c9d20 100644
--- a/netbox/netbox/graphql/schema.py
+++ b/netbox/netbox/graphql/schema.py
@@ -38,8 +38,7 @@ class Query(
     query=Query,
     config=StrawberryConfig(auto_camel_case=False),
     extensions=[
-        # DjangoOptimizerExtension(prefetch_custom_queryset=True),
-        DjangoOptimizerExtension(prefetch_custom_queryset=True, enable_prefetch_related_optimization=False),
+        DjangoOptimizerExtension(prefetch_custom_queryset=True),
         MaxAliasesLimiter(max_alias_count=settings.GRAPHQL_MAX_ALIASES),
     ]
 )
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 9f514684fb..1b0d2b217d 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -775,7 +775,6 @@ def _setting(name, default=None):
 STRAWBERRY_DJANGO = {
     "DEFAULT_PK_FIELD_NAME": "id",
     "TYPE_DESCRIPTION_FROM_MODEL_DOCSTRING": True,
-    "USE_DEPRECATED_FILTERS": False,
 }
 
 #
diff --git a/netbox/vpn/graphql/enums.py b/netbox/vpn/graphql/enums.py
index 7b66818adf..9dc6bdac46 100644
--- a/netbox/vpn/graphql/enums.py
+++ b/netbox/vpn/graphql/enums.py
@@ -23,8 +23,6 @@
 
 @strawberry.enum
 class TunnelStatusEnum(Enum):
-    key = 'Tunnel.status'
-
     STATUS_PLANNED = 'planned'
     STATUS_ACTIVE = 'active'
     STATUS_DISABLED = 'disabled'
diff --git a/netbox/wireless/graphql/enums.py b/netbox/wireless/graphql/enums.py
index 1526b2ff3b..da8368cde3 100644
--- a/netbox/wireless/graphql/enums.py
+++ b/netbox/wireless/graphql/enums.py
@@ -18,8 +18,6 @@ class WirelessRoleEnum(Enum):
 
 @strawberry.enum
 class WirelessLANStatusEnum(Enum):
-    key = 'WirelessLAN.status'
-
     STATUS_ACTIVE = 'active'
     STATUS_RESERVED = 'reserved'
     STATUS_DISABLED = 'disabled'