diff --git a/tasks/main.yml b/tasks/main.yml
index 5d56b19..80a11f5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,14 +9,6 @@
   - name: Wait for ready
     shell: '{{ apigee_all }} wait_for_ready'
 
-  - name: Small time delay for component boot, change with -e component_start_delay=
-    pause:
-      seconds: '{{ component_start_delay | default(1) }}'
-
-  - name: Validate component status
-    shell: '{{ apigee_all }} status'
-    when: opdk_version | version_compare('4.16.01', '>=')
-
   rescue:
 
     - name: Validate status failed, trying component start...
@@ -26,10 +18,7 @@
     - name: Wait for ready
       shell: '{{ apigee_all }} wait_for_ready'
 
-    - name: Small time delay for component boot, change with -e component_start_delay=
-      pause:
-        seconds: '{{ component_start_delay | default(1) }}'
+  - name: Validate component status
+    shell: '{{ apigee_all }} status'
+    when: opdk_version | version_compare('4.16.01', '>=')
 
-- name: Validating component status a second time
-  shell: '{{ apigee_all }} status'
-  when: opdk_version | version_compare('4.16.01', '>=')