diff --git a/roles/cloud-azure/handlers/main.yml b/roles/cloud-azure/handlers/main.yml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/roles/cloud-digitalocean/handlers/main.yml b/roles/cloud-digitalocean/handlers/main.yml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/roles/cloud-ec2/handlers/main.yml b/roles/cloud-ec2/handlers/main.yml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/roles/cloud-gce/handlers/main.yml b/roles/cloud-gce/handlers/main.yml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/roles/local/handlers/main.yml b/roles/local/handlers/main.yml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/roles/local/tasks/prompts.yml b/roles/local/tasks/prompts.yml
index e4aaf7ec0..1f5edc2e4 100644
--- a/roles/local/tasks/prompts.yml
+++ b/roles/local/tasks/prompts.yml
@@ -2,12 +2,16 @@
 - pause:
     prompt: |
       Enter the IP address of your server: (or use localhost for local installation):
+      [localhost]
   register: _algo_server
   when: server is undefined
 
 - name: Set the facts
   set_fact:
-    cloud_instance_ip: "{{ server | default(_algo_server.user_input) }}"
+    cloud_instance_ip:  >-
+      {% if server is defined %}{{ server }}
+      {%- elif _algo_server.user_input is defined and _algo_server.user_input != "" %}{{ _algo_server.user_input }}
+      {%- else %}localhost{% endif %}
 
 - pause:
     prompt: |