diff --git a/shared/enumerations/enumerations.bpmn b/shared/enumerations/enumerations.bpmn
index c989f4d1..12424c70 100644
--- a/shared/enumerations/enumerations.bpmn
+++ b/shared/enumerations/enumerations.bpmn
@@ -34,15 +34,6 @@
       <bpmn:incoming>Flow_1nenbjs</bpmn:incoming>
       <bpmn:outgoing>Flow_1vvnsbc</bpmn:outgoing>
     </bpmn:callActivity>
-    <bpmn:scriptTask id="Activity_1ig6ogz" name="Build Enum List" scriptFormat="python">
-      <bpmn:script># Build Enum List
-enumerations_items_list_cnt = enumerations["Count"]
-enumerations_list = []
-enumerations_list.append({'label': 'Add New', 'value': 'add'})
-for n in range(0, enumerations_items_list_cnt):
-    if enumerations_items_list[n]["Subject"] == "Enumeration":
-        enumerations_list.append({'label': enumerations_items_list[n]["Label"], 'value': enumerations_items_list[n]["Value"]})</bpmn:script>
-    </bpmn:scriptTask>
     <bpmn:userTask id="Activity_0bvdyir" name="Which Enumeration">
       <bpmn:extensionElements>
         <spiffworkflow:properties>
@@ -146,6 +137,10 @@ addLabel = ""</spiffworkflow:postScript>
         <dc:Bounds x="700" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1i2gua9_di" bpmnElement="Call_Shared_Build_Enum_List_from_AWS">
+        <dc:Bounds x="-10" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_05qgorp_di" bpmnElement="Activity_0bvdyir">
         <dc:Bounds x="170" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -164,6 +159,9 @@ addLabel = ""</spiffworkflow:postScript>
       <bpmndi:BPMNShape id="Activity_112vjvq_di" bpmnElement="Activity_0exwh7c">
         <dc:Bounds x="870" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_00b9bxo_di" bpmnElement="Event_00b9bxo">
+        <dc:Bounds x="-128" y="159" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1clgwgu_di" bpmnElement="Gateway_1clgwgu" isMarkerVisible="true">
         <dc:Bounds x="375" y="335" width="50" height="50" />
         <bpmndi:BPMNLabel>
@@ -176,17 +174,6 @@ addLabel = ""</spiffworkflow:postScript>
       <bpmndi:BPMNShape id="Gateway_1wd2vi1_di" bpmnElement="Gateway_1wd2vi1" isMarkerVisible="true">
         <dc:Bounds x="195" y="335" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1gnw1ju_di" bpmnElement="Activity_1ig6ogz">
-        <dc:Bounds x="0" y="30" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_00b9bxo_di" bpmnElement="Event_00b9bxo">
-        <dc:Bounds x="-128" y="159" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1i2gua9_di" bpmnElement="Call_Shared_Build_Enum_List_from_AWS">
-        <dc:Bounds x="-10" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0d8570g_di" bpmnElement="Flow_0d8570g">
         <di:waypoint x="270" y="177" />
         <di:waypoint x="350" y="177" />