diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index 1a14538..dcf2f08 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -2,9 +2,7 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
-#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
   tags:
   - apigee-component
diff --git a/components/opdk-pre-requisites.yml b/components/opdk-pre-requisites.yml
index 4be8465..8ebdd6b 100644
--- a/components/opdk-pre-requisites.yml
+++ b/components/opdk-pre-requisites.yml
@@ -16,7 +16,6 @@
   - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-os-limits
-#  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
   - apigee-pre-req
   - apigee-tuning
@@ -46,7 +45,6 @@
   - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-silent-installation-config
-#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
   - apigee-pre-req
   - apigee-silent-config
diff --git a/components/opdk-setup-postgres-common.yml b/components/opdk-setup-postgres-common.yml
deleted file mode 100644
index 7015614..0000000
--- a/components/opdk-setup-postgres-common.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-enable-swap
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-apigee-user
-  - apigee-opdk-setup-os-postgres
-  - apigee-opdk-setup-postgres-config
-
-- include: opdk-install-component.yml
-  vars:
-    hosts: '{{ hosts }}'
-    component_profile: 'ps'
-
-- include: 'opdk-setup-postgres-{{ pg_component }}.yml'
-  when: pg_component is defined
-
-- hosts: '{{ hosts }}'
-  serial: 1
-  roles:
-  - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain server self report
-    opdk_server_self:
-      server_type: 'ps'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-    ignore_errors: yes
diff --git a/components/opdk-setup-postgres-master.yml b/components/opdk-setup-postgres-master.yml
deleted file mode 100644
index 1fa4f95..0000000
--- a/components/opdk-setup-postgres-master.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  serial: 1
-  roles:
-  - apigee-opdk-setup-postgres-master
-  tags:
-  - pgmaster
diff --git a/components/opdk-setup-postgres-standby.yml b/components/opdk-setup-postgres-standby.yml
deleted file mode 100644
index a8dbba2..0000000
--- a/components/opdk-setup-postgres-standby.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  serial: 1
-  roles:
-  - apigee-opdk-setup-postgres-standby
-  tags:
-  - pgstandby
diff --git a/components/opdk-setup-postgresql-add.yml b/components/opdk-setup-postgresql-add.yml
deleted file mode 100644
index 6e45161..0000000
--- a/components/opdk-setup-postgresql-add.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
-  - { role: apigee-opdk-server-self, server_type: 'ps'}
-  - apigee-opdk-setup-postgresql-add
-
diff --git a/installation.yml b/installation.yml
index 8a9737e..c75ddb2 100644
--- a/installation.yml
+++ b/installation.yml
@@ -73,8 +73,8 @@
     hosts: 'dc-3-ds'
     jdk_version: '1.8'
   tags:
-  - ms
-  - ms-3
+  - ds
+  - ds-3
 
 #- include: components/opdk-cassandra-rebuild.yml
 #  vars:
@@ -84,14 +84,6 @@
 #  - ms
 #  - ms-2
 
-#- include: configuration/opdk-set-reachable.yml
-#  vars:
-#    hosts: 'dc-3-rmp'
-#    reachability: 'false'
-#  tags:
-#  - rmp
-#  - rmp-3
-
 - include: components/opdk-install-component.yml
   vars:
     hosts: 'dc-3-rmp'
@@ -101,14 +93,6 @@
   - rmp
   - rmp-3
 
-#- include: configuration/opdk-set-reachable.yml
-#  vars:
-#    hosts: 'dc-3-rmp'
-#    reachability: 'true'
-#  tags:
-#  - rmp
-#  - rmp-3
-
 - include: configuration/opdk-set-reachable.yml
   vars:
     hosts: 'dc-2-rmp'
diff --git a/requirements.yml b/requirements.yml
index 23e8e59..5180921 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -80,3 +80,5 @@
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgresql-add.git
 
 - src: https://github.com/carlosfrias/apigee-opdk-server-self.git
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-analytics-group-add.git
diff --git a/validations/opdk-server-self.yml b/validations/opdk-server-self.yml
index 9df5396..52b7e24 100644
--- a/validations/opdk-server-self.yml
+++ b/validations/opdk-server-self.yml
@@ -7,41 +7,12 @@
   - { role: apigee-opdk-server-self, server_type: 'router' }
   - { role: apigee-opdk-server-self, server_type: 'mp' }
 
-#  tasks:
-#  - name: Obtain router server self report
-#    ignore_errors: yes
-#    opdk_server_self:
-#      server_type: 'router'
-#      username: '{{ opdk_user_email }}'
-#      password: '{{ opdk_user_pass }}'
-#  - debug: var="edge_router_self"
-#
-#  - name: Obtain message processor server self report
-#    ignore_errors: yes
-#    opdk_server_self:
-#      server_type: 'mp'
-#      username: '{{ opdk_user_email }}'
-#      password: '{{ opdk_user_pass }}'
-#
-#  - debug: var="edge_mp_self"
-
-
 - hosts: pg
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
   - { role: apigee-opdk-server-self, server_type: 'ps' }
-#  tasks:
-#  - name: Obtain postgres server self report
-#    ignore_errors: yes
-#    opdk_server_self:
-#      server_type: 'ps'
-#      username: '{{ opdk_user_email }}'
-#      password: '{{ opdk_user_pass }}'
-#
-#  - debug: var="edge_ps_self"
-
 
 - hosts: qpid
   serial: 1
@@ -49,16 +20,6 @@
   - ~/.apigee/credentials.yml
   roles:
   - { role: apigee-opdk-server-self, server_type: 'qs' }
-#  tasks:
-#  - name: Obtain qpid server self report
-#    ignore_errors: yes
-#    opdk_server_self:
-#      server_type: 'qs'
-#      username: '{{ opdk_user_email }}'
-#      password: '{{ opdk_user_pass }}'
-#
-#  - debug: var="edge_qs_self"
-
 
 - hosts: ms
   serial: 1
@@ -66,13 +27,4 @@
   - ~/.apigee/credentials.yml
   roles:
   - { role: apigee-opdk-server-self, server_type: 'ms' }
-#  tasks:
-#  - name: Obtain management server self report
-#    ignore_errors: yes
-#    opdk_server_self:
-#      server_type: 'ms'
-#      username: '{{ opdk_user_email }}'
-#      password: '{{ opdk_user_pass }}'
-#
-#  - debug: var="edge_ms_self"