diff --git a/workbooks/baremetal.yaml b/workbooks/baremetal.yaml
index 1bec58c0a..f3d4e24ee 100644
--- a/workbooks/baremetal.yaml
+++ b/workbooks/baremetal.yaml
@@ -1057,7 +1057,6 @@ workflows:
 
     input:
       - node_uuids
-      - queue_name: tripleo
 
     tags:
       - tripleo-common-managed
@@ -1066,37 +1065,12 @@ workflows:
 
       cell_v2_discover_hosts:
         on-success: wait_for_nova_resources
-        on-error: cell_v2_discover_hosts_failed
         action: tripleo.baremetal.cell_v2_discover_hosts
 
-      cell_v2_discover_hosts_failed:
-        on-success: send_message
-        publish:
-          status: FAILED
-          message: <% task(cell_v2_discover_hosts).result %>
-
       wait_for_nova_resources:
-        on-success: send_message
-        on-error: wait_for_nova_resources_failed
         with-items: node_uuid in <% $.node_uuids %>
         action: nova.hypervisors_find hypervisor_hostname=<% $.node_uuid %>
 
-      wait_for_nova_resources_failed:
-        on-success: send_message
-        publish:
-          status: FAILED
-          message: <% task(wait_for_nova_resources).result %>
-
-      send_message:
-        workflow: tripleo.messaging.v1.send
-        input:
-          queue_name: <% $.queue_name %>
-          type: <% execution().name %>
-          status: <% $.get('status', 'SUCCESS') %>
-          message: <% $.get('message', '') %>
-          execution: <% execution() %>
-
-
   discover_nodes:
     description: Run nodes discovery over the given IP range