diff --git a/chatmastermind/main.py b/chatmastermind/main.py
index 8aef252..1796f69 100755
--- a/chatmastermind/main.py
+++ b/chatmastermind/main.py
@@ -6,13 +6,13 @@ import yaml
 import sys
 import argcomplete
 import argparse
-import pathlib
+from pathlib import Path
 from .utils import terminal_width, print_tag_args, print_chat_hist, display_source_code, ChatType
-from .storage import save_answers, create_chat_hist, get_tags_unique, read_file, dump_data
+from .storage import save_answers, create_chat_hist, read_file, dump_data
 from .api_client import ai, openai_api_key, print_models
 from .configuration import Config
 from .chat import ChatDB
-from .message import MessageFilter
+from .message import Message, MessageFilter
 from itertools import zip_longest
 from typing import Any
 
@@ -64,8 +64,8 @@ def tags_cmd(args: argparse.Namespace, config: Config) -> None:
     """
     Handler for the 'tags' command.
     """
-    chat = ChatDB.from_dir(cache_path=pathlib.Path('.'),
-                           db_path=pathlib.Path(config.db))
+    chat = ChatDB.from_dir(cache_path=Path('.'),
+                           db_path=Path(config.db))
     if args.list:
         tags_freq = chat.tags_frequency(args.prefix, args.contain)
         for tag, freq in tags_freq.items():
@@ -127,7 +127,7 @@ def print_cmd(args: argparse.Namespace, config: Config) -> None:
     """
     Handler for the 'print' command.
     """
-    fname = pathlib.Path(args.file)
+    fname = Path(args.file)
     if fname.suffix == '.yaml':
         with open(args.file, 'r') as f:
             data = yaml.load(f, Loader=yaml.FullLoader)