diff --git a/tasks/main.yml b/tasks/main.yml
index ef00d82..bd3d724 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,5 @@
 ---
 # tasks file for apigee-opdk-setup-component
-#- block:
-
 - name: Use no proxy definitions
   include: with_no_proxy.yml
   when: opdk_version | version_compare('4.16', '>=') and http_proxy is not defined and https_proxy is not defined
@@ -10,12 +8,6 @@
   include: with_proxy.yml
   when: opdk_version | version_compare('4.16', '>=') and http_proxy is defined and https_proxy is defined
 
-#  rescue:
-#
-#    - name: Validate status failed, trying component start...
-#      command: '{{ apigee_all }} start'
-#      when: opdk_version | version_compare('4.16.01', '>=')
-
 - name: Wait for ready
   ignore_errors: "{{ ignore_errors | default('no') }}"
   command: '{{ apigee_all }} wait_for_ready'
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 448d515..97408aa 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -2,12 +2,6 @@
 - name: Install Apigee component for version {{ opdk_version }} or greater with no proxy - {{ profile }}
   command: '{{ apigee_setup }} -p {{ profile }} -f {{ opdk_installation_config_file }}'
   when: opdk_version | version_compare('4.16.01', '>=')
-#  register: result
-#
-#- name: Installation with no proxy failed
-#  fail:
-#    msg: "Apigee Component failed"
-#  when: result | failed
 
 - name: Wait for ready with no proxy
   command: '{{ apigee_all }} wait_for_ready'
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index d2f5027..3c6ff8b 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -6,12 +6,6 @@
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
     no_proxy: "{{ no_proxy }}"
-#  register: result
-
-#- name: Installation with proxy failed
-#  fail:
-#    msg: "Apigee Component failed"
-#  when: result.failed is defined and result.failed | bool
 
 - name: Wait for ready with no proxy
   command: '{{ apigee_all }} wait_for_ready'