diff --git a/pyrit/models/message_piece.py b/pyrit/models/message_piece.py
index 91d01032b..59f0de336 100644
--- a/pyrit/models/message_piece.py
+++ b/pyrit/models/message_piece.py
@@ -12,6 +12,7 @@
 from pyrit.models.literals import ChatMessageRole, PromptDataType, PromptResponseError
 
 if TYPE_CHECKING:
+    from pyrit.models.message import Message
     from pyrit.models.score import Score
 
 Originator = Literal["attack", "converter", "undefined", "scorer"]
@@ -226,7 +227,7 @@ def get_role_for_storage(self) -> ChatMessageRole:
         """
         return self._role
 
-    def to_message(self) -> Message:  # type: ignore[name-defined] # noqa: F821
+    def to_message(self) -> Message:
         """
         Convert this message piece into a Message.
 
@@ -235,7 +236,7 @@ def to_message(self) -> Message:  # type: ignore[name-defined] # noqa: F821
         """
         from pyrit.models.message import Message
 
-        return Message([self])  # noqa: F821
+        return Message([self])
 
     def has_error(self) -> bool:
         """