diff --git a/.travis.yml b/.travis.yml
index 3badf5c..c0b7f10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ before_install:
     sudo apt-get update && sudo apt-get install -y bridge-utils dnsmasq-base ebtables libvirt-bin libvirt-dev qemu-kvm qemu-utils ruby-dev
     sudo dpkg -i vagrant_2.2.7_x86_64.deb
     sudo vagrant plugin install vagrant-libvirt
+    rm -rf vagrant_2.2.7_*
 
   - |
     sudo apt-get -y purge python3-openssl && sudo apt-get -y autoremove
diff --git a/molecule/default/group_vars/all/00-defaults.yml b/molecule/default/group_vars/all/00-defaults.yml
deleted file mode 120000
index 796af02..0000000
--- a/molecule/default/group_vars/all/00-defaults.yml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../defaults/main.yml
\ No newline at end of file
diff --git a/molecule/default/group_vars/all/99-molecule.yml b/molecule/default/group_vars/all/99-molecule.yml
deleted file mode 100644
index 858af07..0000000
--- a/molecule/default/group_vars/all/99-molecule.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-
-# (c) Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index f5a545f..81655b1 100644
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -21,30 +21,35 @@
   tasks:
     - name: cp -rfT /etc/skel /root
       raw: |
+        set -ex
         cp -rfT /etc/skel /root
       changed_when: false
       ignore_errors: true
 
     - name: setenforce 0
       raw: |
+        set -ex
         setenforce 0
       changed_when: false
       ignore_errors: true
 
     - name: systemctl stop firewalld.service
       raw: |
+        set -ex
         systemctl stop firewalld.service
       changed_when: false
       ignore_errors: true
 
     - name: systemctl stop ufw.service
       raw: |
+        set -ex
         systemctl stop ufw.service
       changed_when: false
       ignore_errors: true
 
     - name: redhat-7 | subscription-manager register
       raw: |
+        set -ex
         subscription-manager register \
           --username={{ lookup('env', 'REDHAT_USERNAME') }} \
           --password={{ lookup('env', 'REDHAT_PASSWORD') }} \
@@ -54,6 +59,7 @@
 
     - name: debian | apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
       raw: |
+        set -ex
         apt-get update
         apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
       changed_when: false
@@ -61,6 +67,7 @@
 
     - name: redhat | yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
       raw: |
+        set -ex
         yum makecache fast
         yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
       changed_when: false
@@ -68,6 +75,7 @@
 
     - name: suse | zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
       raw: |
+        set -ex
         zypper -n --gpg-auto-import-keys refresh
         zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
       changed_when: false