diff --git a/roles/karaage3.1.17/tasks/karaage.yml b/roles/karaage3.1.17/tasks/karaage.yml
index 0787d00a074701a62504ab8412c69e731e2cd6c8..57101bed1b63a55301cfc8fffad8396aa60902e5 100644
--- a/roles/karaage3.1.17/tasks/karaage.yml
+++ b/roles/karaage3.1.17/tasks/karaage.yml
@@ -33,14 +33,14 @@
  when: ansible_os_family == "RedHat" 
 -
  name: Install the latest pip
- shell: source /root/.bash_profile; easy_install pip
+ shell: easy_install pip
  when: ansible_os_family == "RedHat"
 -
  name: "Getting Karaage from Github"
  git: repo="https://github.com/monash-merc/karaage.git" dest="/root/karaage3.1.7"
 -
  name: "Installing Karaage Dependencies"
- shell: source /root/.bash_profile; pip install {{ item }}
+ pip: name={{ item }}
  with_items:
   - six
   - MySQL-python
@@ -54,7 +54,7 @@
  replace: dest=/root/karaage3.1.7/setup.py regexp="Django >= 1.7" replace="Django == 1.7.8"
 -
  name: "Installing Karaage from source"
- shell: "source /root/.bash_profile; env python setup.py install"
+ shell: "env python setup.py install"
  args:
   chdir: /root/karaage3.1.7
   creates: /root/karaage3.1.7/build/bdist.linux-x86_64
@@ -71,10 +71,6 @@
 -
  name: "Change permissions for /var/www"
  file: path=/var/www state=directory owner=root group={{ apache_user }} mode=0775
--
- name: Create a symlink to mod_wsgi-py27.so
- file: src=/opt/rh/python27/root/usr/lib64/python2.7/site-packages/mod_wsgi/server/mod_wsgi-py27.so dest=/usr/lib64/httpd/modules/mod_wsgi.so owner=root group=root state=link
- when: ansible_os_family == "RedHat"  and ansible_distribution_major_version < '7'
 -
  name: "enabling Karaage configuration"
  shell: a2enconf karaage3-wsgi
@@ -107,7 +103,7 @@
     chdir: "/root/{{ item }}"
     creates: "/root/{{ item }}/build/bdist.linux-x86_64"
   name: "Installing other packages RedHat"
-  shell: "source /root/.bash_profile ; env python setup.py install"
+  shell: "env python setup.py install"
   when: ansible_os_family == "RedHat"
   with_items: 
     - numpy
@@ -121,7 +117,7 @@
  lineinfile: dest=/etc/karaage3/settings.py regexp="SECRET_KEY = ''" line="SECRET_KEY = 'imkaraage'" state=present
 -
  name: " Create DB tables"
- shell: source /root/.bash_profile ; kg-manage migrate 
+ shell: kg-manage migrate 
 -
  name: "Restarting Celery"
  service: name=karaage3-celery state=restarted
diff --git a/roles/karaage3.1.17/tasks/main.yml b/roles/karaage3.1.17/tasks/main.yml
index 499a48fa14137a818a8ddf2de916f5a4faa0d753..3fb11c21787e45de3da5ff4380ccc60b8662a0e4 100644
--- a/roles/karaage3.1.17/tasks/main.yml
+++ b/roles/karaage3.1.17/tasks/main.yml
@@ -1,8 +1,6 @@
 ---
  - include: prerequisitesDebian.yml
    when: ansible_os_family == "Debian"
- - include: prerequisitesRedHat.yml
-   when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
  - include: apacheDebian.yml
    when: ansible_os_family == "Debian"
  - include: apacheRedHat.yml
diff --git a/roles/karaage3.1.17/tasks/prerequisitesRedHat.yml b/roles/karaage3.1.17/tasks/prerequisitesRedHat.yml
deleted file mode 100644
index a09f96492ef47a7bc281f6de9190a177b48d7458..0000000000000000000000000000000000000000
--- a/roles/karaage3.1.17/tasks/prerequisitesRedHat.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
--
- name: Installing SCLs for Centos
- yum: name={{ item }} state=latest
- with_items:
-  - centos-release-SCL
-  - python27
--
- name: Setting the correct environment variables
- template: src=.bash_profile.j2 dest={{ ansible_env.HOME }}/.bash_profile owner=ec2-user mode=0644
diff --git a/roles/karaage3.1.17/templates/.bash_profile.j2 b/roles/karaage3.1.17/templates/.bash_profile.j2
deleted file mode 100644
index 7e4d1d318be6a92937cdd258869a8a4ab89c1739..0000000000000000000000000000000000000000
--- a/roles/karaage3.1.17/templates/.bash_profile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# .bash_profile
-
-# Get the aliases and functions
-if [ -f ~/.bashrc ]; then
-	. ~/.bashrc
-fi
-
-# User specific environment and startup programs
-
-PATH=$PATH:$HOME/bin
-export PYTHONPATH=/opt/rh/python27/root/usr/lib/python2.7
-export PATH=/opt/rh/python27/root/usr/bin:$PATH
-export LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib:/opt/rh/python27/root/usr/lib64:$LD_LIBRARY_PATH
diff --git a/roles/karaage3.1.17/vars/main.yml b/roles/karaage3.1.17/vars/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..639e52847c015ad1b083c78e9b4abb3ad1b27b20
--- /dev/null
+++ b/roles/karaage3.1.17/vars/main.yml
@@ -0,0 +1,2 @@
+---
+ apache_user: "{% if ansible_os_family == 'RedHat'  %}apache{% else %}www-data{% endif %}"
diff --git a/roles/ldapserver/vars/CentOS_6.6_x86_64.yml b/roles/ldapserver/vars/CentOS_6.6_x86_64.yml
deleted file mode 100644
index 6df1376a24b1c49c05ce26eff64e46fd1a7b7577..0000000000000000000000000000000000000000
--- a/roles/ldapserver/vars/CentOS_6.6_x86_64.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
- system_packages:
-  - openldap-servers
-  - openldap-clients
-  - openssl
- ldapuser:  ldap
- ldapgroup: ldap
- dbname: olcDatabase={2}bdb