diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index e1849d1..22bc4e7 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -1,15 +1,9 @@
 ---
 # tasks file for external-port-connectivity-validator-server
-- name: Source server to connect from
+- name: Client validator
   debug:
-    msg: 'Source Server: {{ local_address }}'
+    msg: 'Client validator: {{ local_address }}'
 
 - name: Validate for open port {{ target_server }}:{{ check_port }}
   uri:
     url: 'http://{{ target_server }}:{{ check_port }}/check'
-
-- name: Shutdown validation server {{ target_server }}:{{ check_port }}
-  uri:
-    url: 'http://{{ target_server }}:{{ check_port }}/done'
-  register: done
-  failed_when: not done.failed
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 692eedd..11a8fa0 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -1,21 +1,12 @@
 ---
 # tasks file for external-port-connectivity-validator-server
-- name: Source server to connect from
+- name: Client validator with proxy
   debug:
     msg: 'Source Server: {{ local_address }}'
 
-- name: Validate for open port {{ target_server }}:{{ check_port }}
+- name: Validate for open port {{ target_server }}:{{ check_port }} with proxy
   uri:
     url: 'http://{{ target_server }}:{{ check_port }}/check'
   environment:
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
-
-- name: Shutdown validation server {{ target_server }}:{{ check_port }}
-  uri:
-    url: 'http://{{ target_server }}:{{ check_port }}/done'
-  register: done
-  failed_when: not done.failed
-  environment:
-    http_proxy: "{{ http_proxy }}"
-    https_proxy: "{{ https_proxy }}"