diff --git a/aries_cloudagent/core/dispatcher.py b/aries_cloudagent/core/dispatcher.py
index 48ffb254b5..16603ab7a1 100644
--- a/aries_cloudagent/core/dispatcher.py
+++ b/aries_cloudagent/core/dispatcher.py
@@ -134,7 +134,6 @@ async def handle_v2_message(
         # send a DCV2 Problem Report here for testing, and to punt procotol handling down
         # the road a bit
         context = RequestContext(profile)
-        # context.message = message
         context.message_receipt = inbound_message.receipt
         responder = DispatcherResponder(
             context,
@@ -145,7 +144,6 @@ async def handle_v2_message(
         )
 
         context.injector.bind_instance(BaseResponder, responder)
-        # responder.connection_id = connection and connection.connection_id
         error_result = V2AgentMessage(
             message={
                 "type": "https://didcomm.org/report-problem/2.0/problem-report",
diff --git a/aries_cloudagent/transport/pack_format.py b/aries_cloudagent/transport/pack_format.py
index 237747358b..30171439fc 100644
--- a/aries_cloudagent/transport/pack_format.py
+++ b/aries_cloudagent/transport/pack_format.py
@@ -82,14 +82,14 @@ def __init__(self):
 
     def get_for_packed_msg(self, packed_msg: Union[str, bytes]) -> BaseWireFormat:
         """Retrieve appropriate DIDComm instance for a given packed message."""
-        format = {
+        pack_format = {
             DIDCommVersion.v1: self.v1pack_format,
             DIDCommVersion.v2: self.v2pack_format,
         }[get_version_for_packed_msg(packed_msg)]
         assert (
             format
         ), "self.v2_pack_format will be set when --experimental-didcomm-v2 is set"
-        return format
+        return pack_format
 
     async def parse_message(
         self, session: ProfileSession, message_body: Union[str, bytes]