diff --git a/common/args.py b/common/args.py
index f737a0c7..400af021 100644
--- a/common/args.py
+++ b/common/args.py
@@ -1,8 +1,7 @@
 """Argparser for overriding config values"""
 
 import argparse
-from typing import get_origin, get_args, Optional, Union, List
-from pydantic import BaseModel
+from typing import get_origin, get_args, Union, List
 from common.tabby_config import config
 
 
diff --git a/common/config_models.py b/common/config_models.py
index 9bbf5f1c..da983b8b 100644
--- a/common/config_models.py
+++ b/common/config_models.py
@@ -1,5 +1,5 @@
 from pydantic import BaseModel, ConfigDict, Field, model_validator
-from typing import List, Optional, Union, get_type_hints
+from typing import List, Optional, Union
 
 from common.utils import unwrap
 
diff --git a/common/gen_logging.py b/common/gen_logging.py
index 3252bb24..6a917dd7 100644
--- a/common/gen_logging.py
+++ b/common/gen_logging.py
@@ -2,9 +2,8 @@
 Functions for logging generation events.
 """
 
-from pydantic import BaseModel
 from loguru import logger
-from typing import Dict, Optional
+from typing import Optional
 
 from common.tabby_config import config
 
diff --git a/common/networking.py b/common/networking.py
index e0812723..597ed078 100644
--- a/common/networking.py
+++ b/common/networking.py
@@ -11,7 +11,6 @@
 from uuid import uuid4
 
 from common.tabby_config import config
-from common.utils import unwrap
 
 
 class TabbyRequestErrorMessage(BaseModel):
diff --git a/common/tabby_config.py b/common/tabby_config.py
index d571319e..9738c120 100644
--- a/common/tabby_config.py
+++ b/common/tabby_config.py
@@ -1,7 +1,7 @@
 import yaml
 import pathlib
 from loguru import logger
-from typing import Optional, Union, get_origin, get_args
+from typing import Optional
 from os import getenv
 
 from common.utils import unwrap, merge_dicts
diff --git a/endpoints/OAI/router.py b/endpoints/OAI/router.py
index f120e4d3..b6a44c98 100644
--- a/endpoints/OAI/router.py
+++ b/endpoints/OAI/router.py
@@ -8,7 +8,6 @@
 from common.model import check_embeddings_container, check_model_container
 from common.networking import handle_request_error, run_with_request_disconnect
 from common.tabby_config import config
-from common.utils import unwrap
 from endpoints.OAI.types.completion import CompletionRequest, CompletionResponse
 from endpoints.OAI.types.chat_completion import (
     ChatCompletionRequest,
diff --git a/endpoints/server.py b/endpoints/server.py
index e1c81b54..d6723a19 100644
--- a/endpoints/server.py
+++ b/endpoints/server.py
@@ -8,7 +8,6 @@
 from common.logger import UVICORN_LOG_CONFIG
 from common.networking import get_global_depends
 from common.tabby_config import config
-from common.utils import unwrap
 from endpoints.Kobold import router as KoboldRouter
 from endpoints.OAI import router as OAIRouter
 from endpoints.core.router import router as CoreRouter
diff --git a/main.py b/main.py
index 6e7943bf..bd706868 100644
--- a/main.py
+++ b/main.py
@@ -16,7 +16,6 @@
 from common.networking import is_port_in_use
 from common.signals import signal_handler
 from common.tabby_config import config
-from common.utils import unwrap
 from endpoints.server import export_openapi, start_api
 from endpoints.utils import do_export_openapi