diff --git a/tasks/4150703-main.yml b/tasks/4150703-main.yml
deleted file mode 100644
index d86ed43..0000000
--- a/tasks/4150703-main.yml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-
-- name: Status of Postgres Database Port
-  register: pg_db_port_status
-  ignore_errors: true
-  wait_for:
-    port: '{{ pg_db_port }}'
-    host: '{{ local_address }}'
-    timeout: 1
-
-- name: Status of Postgres External Managment Port
-  register: pg_ext_mgmt_port_status
-  ignore_errors: true
-  wait_for:
-    port: '{{ pg_ext_mgmt_port }}'
-    host: '{{ local_address }}'
-    timeout: 1
-
-- name: Status of Postgres Internal Management Port
-  register: pg_int_mgmt_port_status
-  ignore_errors: true
-  wait_for:
-    port: '{{ pg_int_mgmt_port }}'
-    host: '{{ local_address }}'
-    timeout: 1
-
-- name: Status of Postgres JMX Port
-  register: pg_jmx_port_status
-  ignore_errors: true
-  wait_for:
-    port: '{{ pg_jmx_port }}'
-    host: '{{ local_address }}'
-    timeout: 1
-
-- name: Setup Postgres
-  ignore_errors: yes
-  shell: "{{ apigee_installation_home }}/share/installer/apigee-setup.sh -f {{ opdk_installation_config_file }} -p ps"
-  when: pg_db_port_status | failed and pg_ext_mgmt_port_status | failed and pg_int_mgmt_port_status | failed and pg_jmx_port_status | failed
-
-- name: Status of Postgres Database Port
-  register: pg_db_port_status
-  ignore_errors: true
-  wait_for:
-    port: '{{ pg_db_port }}'
-    host: '{{ local_address }}'
-    timeout: 1
-
-- name: Status of Postgres External Managment Port
-  register: pg_ext_mgmt_port_status
-  ignore_errors: true
-  wait_for:
-    port: '{{ pg_ext_mgmt_port }}'
-    host: '{{ local_address }}'
-    timeout: 1
-
-- name: Status of Postgres Internal Management Port
-  register: pg_int_mgmt_port_status
-  ignore_errors: true
-  wait_for:
-    port: '{{ pg_int_mgmt_port }}'
-    host: '{{ local_address }}'
-    timeout: 1
-
-- name: Status of Postgres JMX Port
-  register: pg_jmx_port_status
-  ignore_errors: true
-  wait_for:
-    port: '{{ pg_jmx_port }}'
-    host: '{{ local_address }}'
-    timeout: 1
-
-- name: Postgres Database Port Failed
-  fail:
-    msg: "Postgres Database port failed to start"
-  when: pg_db_port_status | failed
-
-- name: Postgres External Management Port Failed
-  fail:
-    msg: "Message Processor External Management port failed to start"
-  when: not pg_ext_mgmt_port_status.state == 'started'
-
-- name: Qpid Internal Management Port Failed
-  fail:
-    msg: "Message Processor Internal Management port failed to start"
-  when: not pg_int_mgmt_port_status.state == 'started'
-
-- name: Qpid JMX Port startup failed
-  fail:
-    msg: "Message Processor JMX port failed to start"
-  when: not pg_jmx_port_status.state == 'started'
-
diff --git a/tasks/main.yml b/tasks/main.yml
index b900530..6c396b7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,8 +1,5 @@
 ---
-# tasks file for apigee-opdk-setup-ps
-- include: 4150703-main.yml
-  when: opdk_version | version_compare('4.16.01', '<')
-
+# tasks file for apigee-opdk-setup-postgres-config
 - name: Set permissions on pgdata folder
   file:
     path: '{{ apigee_postgresql_data_dir }}'