diff --git a/api/controllers/console/auth/login.py b/api/controllers/console/auth/login.py
index f6faeb9f3a..7bed4a814b 100644
--- a/api/controllers/console/auth/login.py
+++ b/api/controllers/console/auth/login.py
@@ -14,7 +14,6 @@ from controllers.console.auth.error import (
     EmailPasswordLoginLimitError,
     InvalidEmailError,
     InvalidTokenError,
-    MFARequiredError,
     MFATokenRequiredError,
 )
 from controllers.console.error import (
diff --git a/api/controllers/console/auth/mfa.py b/api/controllers/console/auth/mfa.py
index 8eed4338b7..cd23dd13ed 100644
--- a/api/controllers/console/auth/mfa.py
+++ b/api/controllers/console/auth/mfa.py
@@ -1,12 +1,8 @@
 from typing import cast
 
 import flask_login
-from flask import request
 from flask_restful import Resource, reqparse
 
-from controllers.console.auth.error import (
-    TokenValidationError,
-)
 from controllers.console.wraps import account_initialization_required
 from libs.login import login_required
 from models.account import Account
diff --git a/api/controllers/console/workspace/account.py b/api/controllers/console/workspace/account.py
index 9c79782f47..a76c2585f3 100644
--- a/api/controllers/console/workspace/account.py
+++ b/api/controllers/console/workspace/account.py
@@ -389,7 +389,8 @@ api.add_resource(EducationAutoCompleteApi, "/account/education/autocomplete")
 # api.add_resource(AccountEmailVerifyApi, '/account/email-verify')
 
 # MFA endpoints
-from controllers.console.auth.mfa import MFASetupInitApi, MFASetupCompleteApi, MFADisableApi, MFAStatusApi
+from controllers.console.auth.mfa import MFADisableApi, MFASetupCompleteApi, MFASetupInitApi, MFAStatusApi
+
 api.add_resource(MFAStatusApi, "/account/mfa/status")
 api.add_resource(MFASetupInitApi, "/account/mfa/setup")
 api.add_resource(MFASetupCompleteApi, "/account/mfa/setup/complete")
diff --git a/api/services/mfa_service.py b/api/services/mfa_service.py
index 5d25cde40c..637d4920af 100644
--- a/api/services/mfa_service.py
+++ b/api/services/mfa_service.py
@@ -3,12 +3,9 @@ import io
 import json
 import secrets
 from datetime import datetime
-from typing import Optional
 
 import pyotp
 import qrcode
-from sqlalchemy import and_
-from sqlalchemy.orm import Session
 
 from models.account import Account, AccountMFASettings
 from models.engine import db
diff --git a/api/tests/integration_tests/controllers/console/auth/test_login_mfa_integration.py b/api/tests/integration_tests/controllers/console/auth/test_login_mfa_integration.py
index 4a8a88594a..50505166fb 100644
--- a/api/tests/integration_tests/controllers/console/auth/test_login_mfa_integration.py
+++ b/api/tests/integration_tests/controllers/console/auth/test_login_mfa_integration.py
@@ -1,13 +1,11 @@
 import json
 import unittest
 from unittest.mock import Mock, patch
-from datetime import datetime
 
 from flask import Flask
 from flask_restful import Api
 
 from controllers.console.auth.login import LoginApi
-from controllers.console.auth.error import MFARequiredError, MFATokenRequiredError
 from models.account import Account, AccountMFASettings
 
 
@@ -289,8 +287,8 @@ class TestMFAEndToEndFlow(unittest.TestCase):
     @patch('services.mfa_service.db.session')
     def test_complete_mfa_setup_flow(self, mock_session, mock_gen_codes, mock_verify, mock_gen_qr, mock_gen_secret):
         """Test complete MFA setup flow from init to completion."""
-        from services.mfa_service import MFAService
         from models.account import Account
+        from services.mfa_service import MFAService
         
         # Mock account
         account = Mock(spec=Account)
diff --git a/api/tests/unit_tests/controllers/console/auth/test_mfa.py b/api/tests/unit_tests/controllers/console/auth/test_mfa.py
index 5b3b638c80..4ef1fd145e 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_mfa.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_mfa.py
@@ -5,13 +5,7 @@ from unittest.mock import Mock, patch
 from flask import Flask
 from flask_restful import Api
 
-from controllers.console.auth.mfa import (
-    MFASetupInitApi,
-    MFASetupCompleteApi,
-    MFADisableApi,
-    MFAStatusApi,
-    MFAVerifyApi
-)
+from controllers.console.auth.mfa import MFADisableApi, MFASetupCompleteApi, MFASetupInitApi, MFAStatusApi, MFAVerifyApi
 from models.account import Account
 
 
diff --git a/api/tests/unit_tests/services/test_mfa_service.py b/api/tests/unit_tests/services/test_mfa_service.py
index b3c5fb32ce..6d16b04f09 100644
--- a/api/tests/unit_tests/services/test_mfa_service.py
+++ b/api/tests/unit_tests/services/test_mfa_service.py
@@ -1,9 +1,7 @@
 import json
 import unittest
-from unittest.mock import Mock, patch
 from datetime import datetime
-
-import pytest
+from unittest.mock import Mock, patch
 
 from models.account import Account, AccountMFASettings
 from services.mfa_service import MFAService