diff --git a/books/main_servers.yml b/books/main_servers.yml
index 88382f3..9642233 100644
--- a/books/main_servers.yml
+++ b/books/main_servers.yml
@@ -1,194 +1,169 @@
 ---
 - name: Get local commit
   hosts: 127.0.0.1
   tags: always
   connection: local
   gather_facts: false
   tasks:
     - shell: "git show-ref -s --head HEAD | head -n 1"
       register: commit
       tags: [ 'always' ]
 
 - name: Configure Jump Server
   hosts: lbs
   tags: conf-lbs
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   port: 222
   user: centos
   become: yes
   roles:
       - role: ../roles/common
         tags: [ 'common' ]
       - role: ../roles/swap/roles/swap
         tags: [ 'common' ]
       - role: ../roles/ganglia-gmond
         tags: [ 'common' ]
       - role: ../roles/nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: ../roles/postfix
         postfix_mynetworks: [ "{{ ip_range }}" ]
         enable_postfix_relayhost: false
       - role: ../roles/letsencrypt
         when: env != "test"
       - role: ../roles/haproxy
       - role: ../roles/jump
   tasks:
     - shell: "echo {{ hostvars['127.0.0.1']['commit']['stdout'] }} > /{{ project_name }}_version"
 
 - name: Configure Monitoring Server
   hosts: monit
   tags: conf-monit
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   become: yes
   roles:
       - role: ../roles/common
         tags: [ 'common' ]
       - role: ../roles/swap/roles/swap
         tags: [ 'common' ]
       - role: ../roles/nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: ../roles/postfix
         tags: [ 'common' ]
       - role: ../roles/logcheck
       - role: ../roles/rsyslog
       - role: ../roles/apache
         apache_config: placeholder.conf
         www_user: apache
       - role: ../roles/nagios
       - role: ../roles/ganglia-gmond
         tags: [ 'common' ]
       - role: ../roles/ganglia-gmetad
   tasks:
       - include: ../roles/mariadb/tasks/install.yml
         yum_repo: ../roles/mariadb/files/yum.repo
       - shell: "echo {{ hostvars['127.0.0.1']['commit']['stdout'] }} > /{{ project_name }}_version"
 
 - name: Configure Databases
   hosts: dbs
   tags: conf-dbs
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   become: yes
   roles:
       - role: ../roles/common
         tags: [ 'common' ]
       - role: ../roles/swap/roles/swap
         tags: [ 'common' ]
       - role: ../roles/nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: ../roles/postfix
         tags: [ 'common' ]
       - role: ../roles/ganglia-gmond
         tags: [ 'common' ]
       - role: ../roles/mariadb
   tasks:
       - include: ../roles/phabricator/tasks/packages.yml
       - include: ../roles/phabricator/tasks/users.yml
       - include: ../roles/phabricator/tasks/install.yml
       - shell: "echo {{ hostvars['127.0.0.1']['commit']['stdout'] }} > /{{ project_name }}_version"
 
 - name: Configure App
   hosts: app
   tags: conf-app
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   become: yes
   roles:
       - role: ../roles/common
         tags: [ 'common' ]
       - role: ../roles/swap/roles/swap
         tags: [ 'common' ]
       - role: ../roles/nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: ../roles/postfix
         postfix_mynetworks: [ "127.0.0.0/8", "{{ internal_ip }}" ]
         tags: [ 'common' ]
       - role: ../roles/ganglia-gmond
         tags: [ 'common' ]
       - role: ../roles/phabricator
       - role: ../roles/shibboleth
       - role: ../roles/apache
         apache_config: phabricator.conf
   tasks:
       - include: ../roles/phabricator/tasks/notif.yml
       - shell: "echo {{ hostvars['127.0.0.1']['commit']['stdout'] }} > /{{ project_name }}_version"
 
-- name: Configure Filesystem for repositories
-  hosts: fs
-  tags: conf-fs
-  vars_files:
-    - "{{ var }}"
-  vars:
-     nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
-  user: centos
-  become: yes
-  roles:
-      - role: ../roles/common
-        tags: [ 'common' ]
-      - role: ../roles/swap/roles/swap
-        tags: [ 'common' ]
-      - role: ../roles/nrpe
-        tags: [ 'common', 'conf-monit' ]
-      - role: ../roles/postfix
-        tags: [ 'common' ]
-      - role: ../roles/ganglia-gmond
-        tags: [ 'common' ]
-      - role: ../roles/glusterfs
-        tags: ['gluster']
-  tasks:
-      - shell: "echo {{ hostvars['127.0.0.1']['commit']['stdout'] }} > /{{ project_name }}_version"
-
 - name: Configure App Daemons part 1
   hosts: phd
   tags: conf-phd
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   become: yes
   roles:
       - role: ../roles/common
         tags: [ 'common' ]
       - role: ../roles/swap/roles/swap
         tags: [ 'common' ]
       - role: ../roles/nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: ../roles/postfix
         tags: [ 'common' ]
       - role: ../roles/ganglia-gmond
         tags: [ 'common' ]
   tasks:
       - include: ../roles/phabricator/tasks/packages.yml
       - include: ../roles/phabricator/tasks/users.yml
       - include: ../roles/phabricator/tasks/logs.yml
       - include: ../roles/phabricator/tasks/ssh.yml
       - include: ../roles/phabricator/tasks/install.yml
       - include: ../roles/phabricator/tasks/daemons.yml
       - include: ../roles/phabricator/tasks/repo.yml
       - include: ../roles/phabricator/tasks/files.yml
       - shell: "echo {{ hostvars['127.0.0.1']['commit']['stdout'] }} > /{{ project_name }}_version"
 
 - name: Configure App Daemons part 2
   hosts: phd
   tags: conf-phd
   vars_files:
     - "{{ var }}"
   user: centos
   become: yes
   roles:
       - role: ../roles/apache
         apache_config: phabricator-withoutshibd.conf