restructure to better manage when server self reports should run.
diff --git a/tasks/main.yml b/tasks/main.yml
index 738de1d..011ac8a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -16,58 +16,3 @@
 - name: View All Status Results
   debug:
     var: results
-
-- name: Obtain management server self report
-  ignore_errors: yes
-  opdk_server_self:
-    server_type: 'ms'
-    username: '{{ opdk_user_email }}'
-    password: '{{ opdk_user_pass }}'
-
-- name: Obtain router server self report
-  ignore_errors: yes
-  opdk_server_self:
-    server_type: 'router'
-    username: '{{ opdk_user_email }}'
-    password: '{{ opdk_user_pass }}'
-
-- name: Router self report
-  debug:
-    var: edge_router_self
-  when: edge_router_self is defined
-
-- name: Obtain message processor server self report
-  ignore_errors: yes
-  opdk_server_self:
-    server_type: 'mp'
-    username: '{{ opdk_user_email }}'
-    password: '{{ opdk_user_pass }}'
-
-- name: Message processor self report
-  debug:
-    var: edge_mp_self
-  when: edge_mp_self is defined
-
-- name: Obtain postgres server self report
-  ignore_errors: yes
-  opdk_server_self:
-    server_type: 'ps'
-    username: '{{ opdk_user_email }}'
-    password: '{{ opdk_user_pass }}'
-
-- name: Postgres server self report
-  debug:
-    var: edge_ps_self
-  when: edge_ps_self is defined
-
-- name: Obtain qpid server self report
-  ignore_errors: yes
-  opdk_server_self:
-    server_type: 'qs'
-    username: '{{ opdk_user_email }}'
-    password: '{{ opdk_user_pass }}'
-
-- name: Qpid server self report
-  debug:
-    var: edge_qs_self
-  when: edge_qs_self is defined