diff --git a/roles/test-mcord-base/defaults/main.yml b/roles/test-mcord-base/defaults/main.yml
index 1cf905f..f4572f7 100644
--- a/roles/test-mcord-base/defaults/main.yml
+++ b/roles/test-mcord-base/defaults/main.yml
@@ -15,13 +15,6 @@
 
 # test-mcord-base/defaults/main.yml
 
-head_cord_profile_dir: "/opt/cord_profile"
-
-xos_ui_port: 9000
-
-xos_admin_user: "xosadmin@opencord.org"
-maas_xos_admin_pass: "{{ lookup('file', '/opt/credentials/xosadmin@opencord.org') }}"
-
 test_networks:
   - management
   - sgi_network
diff --git a/roles/test-mcord-base/tasks/main.yml b/roles/test-mcord-base/tasks/main.yml
index 193c4d7..aa5ae9a 100644
--- a/roles/test-mcord-base/tasks/main.yml
+++ b/roles/test-mcord-base/tasks/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # test-mcord-base/tasks/main.yml
 # Run tests to check that the base elements of M-CORD are present