diff --git a/src/agent.py b/src/agent.py
index 6177606f..d82fc7f9 100644
--- a/src/agent.py
+++ b/src/agent.py
@@ -2,7 +2,6 @@ import asyncio
 import json
 import logging
 import os
-from collections.abc import Iterable
 from typing import Any, Optional
 
 import sentry_sdk
diff --git a/src/db.py b/src/db.py
index 93872b3c..317bb011 100644
--- a/src/db.py
+++ b/src/db.py
@@ -1,5 +1,4 @@
 import contextvars
-import os
 from typing import Optional
 
 from sqlalchemy import MetaData, create_engine, text
diff --git a/src/deriver/consumer.py b/src/deriver/consumer.py
index 24a99a69..c9c72769 100644
--- a/src/deriver/consumer.py
+++ b/src/deriver/consumer.py
@@ -6,11 +6,12 @@ from langfuse.decorators import observe
 from rich.console import Console
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from src.config import settings
+
 from .. import crud
 from ..utils import history
 from .tom.embeddings import CollectionEmbeddingStore
 from .tom.long_term import extract_facts_long_term
-from src.config import settings
 
 logger = logging.getLogger(__name__)
 logging.getLogger("sqlalchemy.engine.Engine").disabled = True
diff --git a/src/deriver/queue.py b/src/deriver/queue.py
index 82489ce0..b133aa85 100644
--- a/src/deriver/queue.py
+++ b/src/deriver/queue.py
@@ -1,5 +1,4 @@
 import asyncio
-import os
 import signal
 from datetime import datetime, timedelta, timezone
 from logging import getLogger
diff --git a/src/deriver/tom/embeddings.py b/src/deriver/tom/embeddings.py
index 059ea791..32e5875b 100644
--- a/src/deriver/tom/embeddings.py
+++ b/src/deriver/tom/embeddings.py
@@ -1,7 +1,5 @@
 import logging
 
-from sqlalchemy.ext.asyncio import AsyncSession
-
 from ... import crud, schemas
 from ...dependencies import tracked_db
 
diff --git a/src/main.py b/src/main.py
index 08ec9b32..2b32795c 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,5 +1,4 @@
 import logging
-import os
 import re
 import uuid
 from contextlib import asynccontextmanager
@@ -12,6 +11,7 @@ from fastapi_pagination import add_pagination
 from sentry_sdk.integrations.fastapi import FastApiIntegration
 from sentry_sdk.integrations.starlette import StarletteIntegration
 
+from src.config import settings
 from src.db import engine, request_context
 from src.exceptions import HonchoException
 from src.routers import (
@@ -25,7 +25,6 @@ from src.routers import (
     users,
 )
 from src.security import create_admin_jwt
-from src.config import settings
 
 
 def get_log_level():
diff --git a/src/security.py b/src/security.py
index 08d371e4..0f182d49 100644
--- a/src/security.py
+++ b/src/security.py
@@ -1,6 +1,5 @@
 import datetime
 import logging
-import os
 from typing import Annotated, Optional
 
 import jwt
@@ -9,8 +8,8 @@ from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from pydantic import BaseModel
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.dependencies import get_db
 from src.config import settings
+from src.dependencies import get_db
 
 from .exceptions import AuthenticationException
 
diff --git a/src/utils/history.py b/src/utils/history.py
index 076d18f9..af008af8 100644
--- a/src/utils/history.py
+++ b/src/utils/history.py
@@ -5,8 +5,8 @@ from typing import Optional, Union, cast
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.utils.model_client import ModelClient, ModelProvider
 from src.config import settings
+from src.utils.model_client import ModelClient, ModelProvider
 
 from .. import models