diff --git a/defaults/main.yml b/defaults/main.yml
index 9df1621..ae9550f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 # defaults file for apigee-opdk-setup-component
-network_pause: 1
\ No newline at end of file
+
diff --git a/tasks/main.yml b/tasks/main.yml
index 06381e1..765cfde 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,13 +1,4 @@
 ---
-# tasks file for apigee-opdk-setup-component
-#- name: Use no proxy definitions
-#  include: with_no_proxy.yml
-#  when: https_proxy is not defined or https_proxy | trim == '' and http_proxy is not defined or http_proxy | trim == ''
-
-#- name: Use proxy definitions
-#  include: with_proxy.yml
-#  when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
-
 - name: Install Apigee component with proxy - {{ component }}
   shell: '{{ apigee_service }} {{ component }} install'
   environment:
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
deleted file mode 100644
index 7b25b28..0000000
--- a/tasks/with_no_proxy.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Clear errors
-  meta: clear_host_errors
-
-- name: Install pre-existing Apigee component with no proxy - {{ component }}
-  shell: '/bin/bash {{ apigee_service }} {{ component }} install'
-  when: opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
-
-- name: DEBUG_MODE - Install pre-existing Apigee component with no proxy - {{ component }}
-  shell: '/bin/bash -x {{ apigee_service }} {{ component }} install'
-  when: opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
-
-- name: Install Apigee component with no proxy - {{ component }}
-  shell: '/bin/bash {{ apigee_service }} {{ component }} install'
-  when: opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
-
-- name: DEBUG_MODE - Install Apigee component with no proxy - {{ component }}
-  shell: '/bin/bash -x {{ apigee_service }} {{ component }} install'
-  when: opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
deleted file mode 100644
index 765cfde..0000000
--- a/tasks/with_proxy.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: Install Apigee component with proxy - {{ component }}
-  shell: '{{ apigee_service }} {{ component }} install'
-  environment:
-    http_proxy: "{{ http_proxy }}"
-    https_proxy: "{{ https_proxy }}"
-    no_proxy: "{{ no_proxy }}"
-  when: opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
-
-- name: DEBUG_MODE - Install Apigee component - {{ component }}
-  shell: '/bin/bash -x {{ apigee_service }} {{ component }} install'
-  environment:
-    http_proxy: "{{ http_proxy }}"
-    https_proxy: "{{ https_proxy }}"
-    no_proxy: "{{ no_proxy }}"
-  when: opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
-