diff --git a/src/hosts/core/commands.py b/src/hosts/core/commands.py
index baa7888..6fac152 100644
--- a/src/hosts/core/commands.py
+++ b/src/hosts/core/commands.py
@@ -10,7 +10,6 @@ from dataclasses import dataclass
 
 if TYPE_CHECKING:
     from .models import HostsFile, HostEntry
-    from .manager import HostsManager
 
 
 @dataclass
@@ -315,7 +314,7 @@ class MoveEntryCommand(Command):
             self.from_index < 0 or self.from_index >= len(hosts_file.entries)):
             return OperationResult(
                 success=False,
-                message=f"Cannot undo move: invalid indices"
+                message="Cannot undo move: invalid indices"
             )
         
         # Move back: from to_index back to from_index
diff --git a/src/hosts/core/dns.py b/src/hosts/core/dns.py
index 67537f7..d790590 100644
--- a/src/hosts/core/dns.py
+++ b/src/hosts/core/dns.py
@@ -6,10 +6,10 @@ batch processing, and status tracking for hostname to IP address resolution.
 
 import asyncio
 import socket
-from datetime import datetime, timedelta
+from datetime import datetime
 from enum import Enum
 from dataclasses import dataclass
-from typing import Optional, List, Dict, Callable
+from typing import Optional, List
 import logging
 
 logger = logging.getLogger(__name__)
diff --git a/src/hosts/core/import_export.py b/src/hosts/core/import_export.py
index c12b250..18e918d 100644
--- a/src/hosts/core/import_export.py
+++ b/src/hosts/core/import_export.py
@@ -8,10 +8,9 @@ file formats including hosts, JSON, and CSV with validation and error handling.
 import json
 import csv
 from pathlib import Path
-from typing import List, Dict, Any, Optional, Union
+from typing import List, Optional
 from dataclasses import dataclass
 from enum import Enum
-import ipaddress
 from datetime import datetime
 
 from .models import HostEntry, HostsFile
diff --git a/src/hosts/tui/details_handler.py b/src/hosts/tui/details_handler.py
index 666bffb..12023ff 100644
--- a/src/hosts/tui/details_handler.py
+++ b/src/hosts/tui/details_handler.py
@@ -177,7 +177,6 @@ class DetailsHandler:
 
             # Update Last Resolved field
             if entry.last_resolved:
-                from datetime import datetime
                 time_str = entry.last_resolved.strftime("%H:%M:%S")
                 date_str = entry.last_resolved.strftime("%Y-%m-%d")
                 dns_resolved_input.value = f"{date_str} {time_str}"
diff --git a/src/hosts/tui/filter_modal.py b/src/hosts/tui/filter_modal.py
index deae81b..5837ab9 100644
--- a/src/hosts/tui/filter_modal.py
+++ b/src/hosts/tui/filter_modal.py
@@ -6,7 +6,7 @@ filtering options including status, type, resolution status, and search filterin
 """
 
 from textual.app import ComposeResult
-from textual.containers import Grid, Horizontal, Vertical, Container
+from textual.containers import Grid, Horizontal, Container
 from textual.widgets import (
     Static, Button, Checkbox, Input, Select, Label, 
     RadioSet, RadioButton, Collapsible
diff --git a/src/hosts/tui/table_handler.py b/src/hosts/tui/table_handler.py
index 8da008c..1eb1476 100644
--- a/src/hosts/tui/table_handler.py
+++ b/src/hosts/tui/table_handler.py
@@ -9,7 +9,6 @@ from rich.text import Text
 from textual.widgets import DataTable
 from typing import List
 
-from ..core.filters import FilterOptions, EntryFilter
 from ..core.models import HostEntry
 
 
diff --git a/tests/test_add_entry_modal.py b/tests/test_add_entry_modal.py
index b9156cf..ba1066a 100644
--- a/tests/test_add_entry_modal.py
+++ b/tests/test_add_entry_modal.py
@@ -6,9 +6,8 @@ DNS name entries, validation, and mutual exclusion logic.
 """
 
 import pytest
-from unittest.mock import Mock, MagicMock
-from textual.widgets import Input, Checkbox, RadioSet, RadioButton, Static
-from textual.app import App
+from unittest.mock import Mock
+from textual.widgets import Input, Checkbox, RadioSet, Static
 
 from src.hosts.tui.add_entry_modal import AddEntryModal
 from src.hosts.core.models import HostEntry
diff --git a/tests/test_dns.py b/tests/test_dns.py
index 4ea034a..138ed99 100644
--- a/tests/test_dns.py
+++ b/tests/test_dns.py
@@ -7,7 +7,7 @@ and integration with hosts entries.
 
 import pytest
 import asyncio
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, patch
 from datetime import datetime, timedelta
 import socket
 
diff --git a/tests/test_import_export.py b/tests/test_import_export.py
index de92230..5ba8447 100644
--- a/tests/test_import_export.py
+++ b/tests/test_import_export.py
@@ -12,8 +12,7 @@ import tempfile
 from pathlib import Path
 from datetime import datetime
 from src.hosts.core.import_export import (
-    ImportExportService, ImportResult, ExportResult, 
-    ExportFormat, ImportFormat
+    ImportExportService, ImportResult, ExportFormat, ImportFormat
 )
 from src.hosts.core.models import HostEntry, HostsFile