diff --git a/docs/api-reference/handlers.md b/docs/api-reference/handlers.md
index f9167083..1b9694f2 100644
--- a/docs/api-reference/handlers.md
+++ b/docs/api-reference/handlers.md
@@ -5,6 +5,3 @@
 ::: strands.handlers.callback_handler
     options:
       heading_level: 2
-::: strands.handlers.tool_handler
-    options:
-      heading_level: 2
diff --git a/docs/api-reference/models.md b/docs/api-reference/models.md
index 1bafb738..58fc27de 100644
--- a/docs/api-reference/models.md
+++ b/docs/api-reference/models.md
@@ -2,6 +2,9 @@
     options:
       heading_level: 1
       members: false
+::: strands.models.model
+    options:
+      heading_level: 2
 ::: strands.models.bedrock
     options:
       heading_level: 2
diff --git a/docs/api-reference/types.md b/docs/api-reference/types.md
index dc42a02b..198c2c79 100644
--- a/docs/api-reference/types.md
+++ b/docs/api-reference/types.md
@@ -17,9 +17,6 @@
 ::: strands.types.media
     options:
       heading_level: 2
-::: strands.types.models
-    options:
-      heading_level: 2
 ::: strands.types.streaming
     options:
       heading_level: 2
diff --git a/docs/user-guide/concepts/agents/agent-loop.md b/docs/user-guide/concepts/agents/agent-loop.md
index e83c423c..7dcc98ff 100644
--- a/docs/user-guide/concepts/agents/agent-loop.md
+++ b/docs/user-guide/concepts/agents/agent-loop.md
@@ -51,7 +51,6 @@ def event_loop_cycle(
     system_prompt: Optional[str],
     messages: Messages,
     tool_config: Optional[ToolConfig],
-    tool_handler: Optional[ToolHandler],
     thread_pool: Optional[ThreadPoolExecutor] = None,
     **kwargs: Any,
 ) -> Tuple[StopReason, Message, EventLoopMetrics, Any]:
diff --git a/docs/user-guide/concepts/model-providers/custom_model_provider.md b/docs/user-guide/concepts/model-providers/custom_model_provider.md
index e7ff3aaf..fcbed9ef 100644
--- a/docs/user-guide/concepts/model-providers/custom_model_provider.md
+++ b/docs/user-guide/concepts/model-providers/custom_model_provider.md
@@ -64,7 +64,7 @@ from typing_extensions import Unpack
 
 from custom.model import CustomModelClient
 
-from strands.types.models import Model
+from strands.models import Model
 from strands.types.content import Messages
 from strands.types.streaming import StreamEvent
 from strands.types.tools import ToolSpec
diff --git a/docs/user-guide/quickstart.md b/docs/user-guide/quickstart.md
index 5a8dde79..cad8df63 100644
--- a/docs/user-guide/quickstart.md
+++ b/docs/user-guide/quickstart.md
@@ -168,9 +168,9 @@ agent("Hello!")
 
 ## Model Providers
 
-### Identifying a configured model 
+### Identifying a configured model
 
-Strands defaults to the Bedrock model provider using Claude 3.7 Sonnet. The model your agent is using can be retrieved by accessing [`model.config`](../api-reference/types.md#strands.types.models.Model.get_config):
+Strands defaults to the Bedrock model provider using Claude 3.7 Sonnet. The model your agent is using can be retrieved by accessing [`model.config`](../api-reference/models.md#strands.models.model.Model.get_config):
 
 ```python
 from strands import Agent