diff --git a/.travis.yml b/.travis.yml
index e4b562b7..2afcd18c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 dist: trusty
-group: deprecated-2017Q2
 sudo: required
 
 python:
@@ -12,6 +11,7 @@ install:
   - sudo pip install urllib3 pyOpenSSL ndg-httpsclient pyasn1
   - sudo apt-get purge -y mysql-common mysql-server mysql-client
   - sudo apt-get install --only-upgrade -y git
+  - sudo apt-get install hhvm && rm -rf /home/travis/.kiex/
   - mkdir -p ~/.bench
   - mkdir -p /tmp/.bench
   - cp -r $TRAVIS_BUILD_DIR/* ~/.bench
diff --git a/playbooks/create_user.yml b/playbooks/create_user.yml
index acda02e2..e853ed6f 100644
--- a/playbooks/create_user.yml
+++ b/playbooks/create_user.yml
@@ -14,16 +14,6 @@
         owner: '{{ frappe_user }}'
         group: '{{ frappe_user }}'
         recurse: yes
-      when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'CentOS' or ansible_distribution == 'Debian'
-
-    - name: Set home folder perms
-      file:
-        path: '/Users/{{ frappe_user }}'
-        mode: 'o+rx'
-        owner: '{{ frappe_user }}'
-        group: '{{ frappe_user }}'
-        recurse: yes
-      when: ansible_distribution == 'MacOSX'
 
     - name: Set /tmp/.bench folder perms
       file:
@@ -31,8 +21,7 @@
         owner: '{{ frappe_user }}'
         group: '{{ frappe_user }}'
         recurse: yes
-      when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'CentOS' or ansible_distribution == 'Debian'
 
     - name: Change default shell to bash
       shell: "chsh {{ frappe_user }} -s $(which bash)"
-...
\ No newline at end of file
+...