diff --git a/misc/qa/madhu-testing/model-with-all-elements/model-with-all-elements.bpmn b/misc/qa/madhu-testing/model-with-all-elements/model-with-all-elements.bpmn
index 9cd04080..9fbf37f9 100644
--- a/misc/qa/madhu-testing/model-with-all-elements/model-with-all-elements.bpmn
+++ b/misc/qa/madhu-testing/model-with-all-elements/model-with-all-elements.bpmn
@@ -25,7 +25,6 @@
         <bpmn:flowNodeRef>Event_0137ppy</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_015fl8l</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1mz10nm</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_1rp51rg</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1ga06pc</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0fzxp68</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1we66i8</bpmn:flowNodeRef>
@@ -156,13 +155,6 @@
       <bpmn:incoming>Flow_15tn94j</bpmn:incoming>
       <bpmn:outgoing>Flow_1ym2u47</bpmn:outgoing>
     </bpmn:callActivity>
-    <bpmn:manualTask id="Activity_1rp51rg" name="Show data from service task">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser>End Service Task Unit Test. Bamboo User : {{bamboo_get_employee.body}}</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0xw9c77</bpmn:incoming>
-      <bpmn:outgoing>Flow_1bjanul</bpmn:outgoing>
-    </bpmn:manualTask>
     <bpmn:userTask id="Activity_1ga06pc" name="User Task ">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser />
@@ -242,9 +234,8 @@
     <bpmn:sequenceFlow id="Flow_1rm6o2k" sourceRef="Event_0137ppy" targetRef="Gateway_00q74af" />
     <bpmn:sequenceFlow id="Flow_0q3mz2i" sourceRef="Gateway_00q74af" targetRef="Activity_0fzxp68" />
     <bpmn:sequenceFlow id="Flow_1ym2u47" sourceRef="Activity_1mz10nm" targetRef="Event_0137ppy" />
-    <bpmn:sequenceFlow id="Flow_0xw9c77" sourceRef="Activity_015fl8l" targetRef="Activity_1rp51rg" />
+    <bpmn:sequenceFlow id="Flow_0xw9c77" sourceRef="Activity_015fl8l" targetRef="Activity_0456jk8" />
     <bpmn:sequenceFlow id="Flow_15tn94j" sourceRef="Activity_1ga06pc" targetRef="Activity_1mz10nm" />
-    <bpmn:sequenceFlow id="Flow_1bjanul" sourceRef="Activity_1rp51rg" targetRef="Activity_0456jk8" />
     <bpmn:sequenceFlow id="Flow_1y73gxe" sourceRef="Activity_0fzxp68" targetRef="Activity_0tbk5h1" />
     <bpmn:sequenceFlow id="Flow_0pmggv3" sourceRef="Activity_1mr50zv" targetRef="Event_1we66i8" />
     <bpmn:sequenceFlow id="Flow_0s317qk" sourceRef="Event_148wg0d" targetRef="Activity_1mr50zv" />
@@ -293,7 +284,7 @@
       </bpmn:endEvent>
     </bpmn:subProcess>
     <bpmn:subProcess id="Activity_0456jk8" name="Collapsed Sub Proc Manual Task ">
-      <bpmn:incoming>Flow_1bjanul</bpmn:incoming>
+      <bpmn:incoming>Flow_0xw9c77</bpmn:incoming>
       <bpmn:outgoing>Flow_1w3zmqc</bpmn:outgoing>
       <bpmn:startEvent id="Event_1qf204v">
         <bpmn:outgoing>Flow_0vbmtf8</bpmn:outgoing>
@@ -639,10 +630,6 @@ Coke = {{coke}}</spiffworkflow:instructionsForEndUser>
         <dc:Bounds x="790" y="521" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_16nsn1d_di" bpmnElement="Activity_1rp51rg">
-        <dc:Bounds x="790" y="311" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0mae3xq_di" bpmnElement="Activity_1ga06pc">
         <dc:Bounds x="630" y="521" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -1009,16 +996,12 @@ Coke = {{coke}}</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0xw9c77_di" bpmnElement="Flow_0xw9c77">
         <di:waypoint x="730" y="351" />
-        <di:waypoint x="790" y="351" />
+        <di:waypoint x="950" y="351" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_15tn94j_di" bpmnElement="Flow_15tn94j">
         <di:waypoint x="730" y="561" />
         <di:waypoint x="790" y="561" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1bjanul_di" bpmnElement="Flow_1bjanul">
-        <di:waypoint x="890" y="351" />
-        <di:waypoint x="950" y="351" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1y73gxe_di" bpmnElement="Flow_1y73gxe">
         <di:waypoint x="1290" y="451" />
         <di:waypoint x="1350" y="451" />