diff --git a/getstream/users/sync/client.py b/getstream/users/sync/client.py
index 7b3cb3e8..db5d6774 100644
--- a/getstream/users/sync/client.py
+++ b/getstream/users/sync/client.py
@@ -1,23 +1,10 @@
-# from datetime import datetime
-from datetime import datetime
 import json
 from typing import Dict, List, Optional
-from getstream.chat.models.ban_response import BanResponse
 from getstream.chat.models.delete_user_response import DeleteUserResponse
-from getstream.chat.models.delete_users_request import DeleteUsersRequest
-from getstream.chat.models.flag_response import FlagResponse
-from getstream.chat.models.query_banned_users_response import QueryBannedUsersResponse
 from getstream.chat.models.sort_param import SortParam
 from getstream.chat.models.update_users_response import UpdateUsersResponse
 from getstream.chat.models.users_response import UsersResponse
-# from getstream.chat.models.flag_response import FlagResponse
-# from getstream.chat.models.mute_user_response import MuteUserResponse
-# from getstream.chat.models.query_banned_users_response import QueryBannedUsersResponse
-# from getstream.chat.models.sort_param import SortParam
-# from getstream.chat.models.users_response import UsersResponse
-from getstream.models.create_guest_response import CreateGuestResponse
 from getstream.models.user_request import UserRequest
-from getstream.models.user_response import UserResponse
 from getstream.sync.base import BaseClient
 from getstream.utils import from_chat_user_dict, to_chat_user_dict
 
diff --git a/getstream/video/sync/client.py b/getstream/video/sync/client.py
index 09cecd6d..c7fde84b 100644
--- a/getstream/video/sync/client.py
+++ b/getstream/video/sync/client.py
@@ -46,37 +46,13 @@
 
 
 from getstream.models.sort_param_request import SortParamRequest
-
-
 from getstream.models.call_settings_request import CallSettingsRequest
-
-
-from getstream.models.call_request import CallRequest
-
-
 from getstream.models.call_request import CallRequest
-
-
 from getstream.models.member_request import MemberRequest
-
-
 from getstream.models.sort_param_request import SortParamRequest
-
-
 from getstream.models.notification_settings_request import NotificationSettingsRequest
-from getstream.models.call_settings_request import CallSettingsRequest
-
-
-from getstream.models.call_settings_request import CallSettingsRequest
-from getstream.models.notification_settings_request import NotificationSettingsRequest
-
-
-from getstream.models.user_request import UserRequest
-
-
+# TODO: generator make imports a set because we have duplicate imports
 from getstream.models.user_request import UserRequest
-
-
 from getstream.models.connect_user_details_request import ConnectUserDetailsRequest
 
 
diff --git a/tests/test_chat_integration.py b/tests/test_chat_integration.py
index 17d76572..b1e4cca2 100644
--- a/tests/test_chat_integration.py
+++ b/tests/test_chat_integration.py
@@ -4,7 +4,6 @@
 import pytest
 from getstream.models.user_request import UserRequest
 from getstream.sync.stream import Stream
-from getstream.version import VERSION
 
 
 VIDEO_API_KEY = os.environ.get("VIDEO_API_KEY")
@@ -60,10 +59,11 @@ def test_update_users(client: Stream):
 #     # client.users.unban_user(target_user_id=user_id, user_id=admin_id)
 
 
-def test_query_users(client:Stream):
+def test_query_users(client: Stream):
     response = client.users.query_users(limit=10)
     assert response.users is not None
 
+
 def test_delete_user(client: Stream):
     user_id = str(uuid.uuid4())
     # create user to ban