cleaned up empty lines
diff --git a/templates/apigee-validate.conf.j2 b/templates/apigee-validate.conf.j2
index 8049e39..2fbd887 100644
--- a/templates/apigee-validate.conf.j2
+++ b/templates/apigee-validate.conf.j2
@@ -3,15 +3,12 @@
{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %}
MSIP={{ hostvars[groups['dc-2-ms'][0]][interface_name].ipv4.address }}
{% else %}
-MSIP=Neither a dc-1 or dc-2 inventory group was defined
+{# Default to the MS in region 1 #}
+MSIP={{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }}
{% endif %}
-
ADMIN_EMAIL={{ opdk_user_email }}
-
APIGEE_PORT_HTTP_MS={{ ms_ext_mgmt_port }}
-
APIGEE_ADMINPW={{ opdk_user_pass }}
-
{% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %}
REGION=dc-1
{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %}
@@ -19,9 +16,7 @@
{% else %}
REGION=Neither a dc-1 or dc-2 inventory group was defined
{% endif %}
-
MP_POD={{ mp_pod }}
-
{% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %}
MP_IP={{ hostvars[groups['dc-1-rmp'][0]][interface_name].ipv4.address }}
{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %}
@@ -29,11 +24,7 @@
{% else %}
MP_IP=Neither a dc-1 or dc-2 inventory group was defined
{% endif %}
-
-
MP_PORT={{ mp_ext_mgmt_port }}
-
-
{% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %}
HOST_ALIAS={{ groups['dc-1-rmp'][0] }}
{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %}
