diff --git a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
index e2c55ea5..ba5ae600 100644
--- a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
+++ b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
@@ -328,18 +328,10 @@ isTest = False</spiffworkflow:preScript>
       <bpmn:startEvent id="Event_0a4hscg">
         <bpmn:outgoing>Flow_0h40vf3</bpmn:outgoing>
       </bpmn:startEvent>
-      <bpmn:sequenceFlow id="Flow_0h40vf3" sourceRef="Event_0a4hscg" targetRef="Call_Waku_Messages_Message_Body" />
-      <bpmn:callActivity id="Call_Waku_Messages_Message_Body" name="Call Waku Messages: Message Body" calledElement="Waku_Messages_Message_Body">
-        <bpmn:extensionElements>
-          <spiffworkflow:preScript>task_id = "waku_invoice_submitted"</spiffworkflow:preScript>
-        </bpmn:extensionElements>
-        <bpmn:incoming>Flow_0h40vf3</bpmn:incoming>
-        <bpmn:outgoing>Flow_0gq7x6m</bpmn:outgoing>
-      </bpmn:callActivity>
+      <bpmn:sequenceFlow id="Flow_0h40vf3" sourceRef="Event_0a4hscg" targetRef="Call_Waku_Messages_Message" />
       <bpmn:endEvent id="Event_0xohu5m">
         <bpmn:incoming>Flow_17xbb2s</bpmn:incoming>
       </bpmn:endEvent>
-      <bpmn:sequenceFlow id="Flow_0gq7x6m" sourceRef="Call_Waku_Messages_Message_Body" targetRef="Call_Waku_Messages_Message_Variables" />
       <bpmn:serviceTask id="Activity_1fsffcq" name="3. Notify CC via Waku &#34;invoice submitted&#34;">
         <bpmn:extensionElements>
           <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="wr">
@@ -354,9 +346,9 @@ isTest = False</spiffworkflow:preScript>
         <bpmn:outgoing>Flow_17xbb2s</bpmn:outgoing>
       </bpmn:serviceTask>
       <bpmn:sequenceFlow id="Flow_17xbb2s" sourceRef="Activity_1fsffcq" targetRef="Event_0xohu5m" />
-      <bpmn:sequenceFlow id="Flow_0nh3yk5" sourceRef="Call_Waku_Messages_Message_Variables" targetRef="Activity_1fsffcq" />
-      <bpmn:callActivity id="Call_Waku_Messages_Message_Variables" name="Call Waku Messages: Message Variables" calledElement="Waku_Messages_Message_Variables">
-        <bpmn:incoming>Flow_0gq7x6m</bpmn:incoming>
+      <bpmn:sequenceFlow id="Flow_0nh3yk5" sourceRef="Call_Waku_Messages_Message" targetRef="Activity_1fsffcq" />
+      <bpmn:callActivity id="Call_Waku_Messages_Message" name="Call Waku Messages: Message" calledElement="Waku_Messages_Message">
+        <bpmn:incoming>Flow_0h40vf3</bpmn:incoming>
         <bpmn:outgoing>Flow_0nh3yk5</bpmn:outgoing>
       </bpmn:callActivity>
     </bpmn:subProcess>
@@ -1473,13 +1465,6 @@ else:
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1wh5lkq">
     <bpmndi:BPMNPlane id="BPMNPlane_1b2zhk5" bpmnElement="Activity_0gkpa9s">
-      <bpmndi:BPMNShape id="Event_0a4hscg_di" bpmnElement="Event_0a4hscg">
-        <dc:Bounds x="132" y="192" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1ygnlnn_di" bpmnElement="Call_Waku_Messages_Message_Body">
-        <dc:Bounds x="210" y="170" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0xohu5m_di" bpmnElement="Event_0xohu5m">
         <dc:Bounds x="702" y="192" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -1487,16 +1472,15 @@ else:
         <dc:Bounds x="540" y="170" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_17rdv3g_di" bpmnElement="Call_Waku_Messages_Message_Variables">
+      <bpmndi:BPMNShape id="Activity_17rdv3g_di" bpmnElement="Call_Waku_Messages_Message">
         <dc:Bounds x="370" y="170" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0a4hscg_di" bpmnElement="Event_0a4hscg">
+        <dc:Bounds x="262" y="192" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0h40vf3_di" bpmnElement="Flow_0h40vf3">
-        <di:waypoint x="168" y="210" />
-        <di:waypoint x="210" y="210" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0gq7x6m_di" bpmnElement="Flow_0gq7x6m">
-        <di:waypoint x="310" y="210" />
+        <di:waypoint x="298" y="210" />
         <di:waypoint x="370" y="210" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_17xbb2s_di" bpmnElement="Flow_17xbb2s">