diff --git a/nailgun/entities.py b/nailgun/entities.py
index 37f3dd40..8874df71 100644
--- a/nailgun/entities.py
+++ b/nailgun/entities.py
@@ -3564,13 +3564,9 @@ class Filter(
 
     def __init__(self, server_config=None, **kwargs):
         self._fields = {
-            'location': entity_fields.OneToManyField(Location),
-            'organization': entity_fields.OneToManyField(Organization),
             'permission': entity_fields.OneToManyField(Permission),
             'role': entity_fields.OneToOneField(Role, required=True),
             'search': entity_fields.StringField(),
-            'override': entity_fields.BooleanField(),
-            'unlimited': entity_fields.BooleanField(),
         }
         self._meta = {'api_path': 'api/v2/filters'}
         super().__init__(server_config=server_config, **kwargs)
@@ -3584,14 +3580,6 @@ def create_payload(self):
         """
         return {'filter': super().create_payload()}
 
-    def read(self, entity=None, attrs=None, ignore=None, params=None):
-        """Deal with different named data returned from the server."""
-        if attrs is None:
-            attrs = self.read_json()
-        attrs['override'] = attrs.pop('override?')
-        attrs['unlimited'] = attrs.pop('unlimited?')
-        return super().read(entity, attrs, ignore, params)
-
     def update_payload(self, fields=None):
         """Wrap submitted data within an extra dict."""
         return {'filter': super().update_payload(fields)}
diff --git a/tests/test_entities.py b/tests/test_entities.py
index 64af1413..ecca9c11 100644
--- a/tests/test_entities.py
+++ b/tests/test_entities.py
@@ -1213,7 +1213,6 @@ def test_attrs_arg_v1(self):
             # entities.UserGroup,  # see test_attrs_arg_v2
             entities.ContentView,
             entities.Domain,
-            entities.Filter,
             entities.Host,
             entities.Media,
             entities.RHCIDeployment,
@@ -1266,11 +1265,6 @@ def test_entity_ids(self):
                 {'parameters': None, 'puppet_proxy': None},
                 {'host_parameters_attributes': None, 'puppet_proxy': None},
             ),
-            (
-                entities.Filter(self.cfg),
-                {'override?': None, 'unlimited?': None},
-                {'override': None, 'unlimited': None},
-            ),
         )
         for entity, attrs_before, attrs_after in test_data:
             with self.subTest(entity):