diff --git a/packer/jambonz-feature-server/files/vimrc.local b/packer/jambonz-feature-server/files/vimrc.local
deleted file mode 100644
index f0f40c1..0000000
--- a/packer/jambonz-feature-server/files/vimrc.local
+++ /dev/null
@@ -1,5 +0,0 @@
-source /usr/share/vim/vim80/defaults.vim
-let skip_defaults_vim = 1
-if has('mouse')
-  set mouse=r
-endif
diff --git a/packer/jambonz-feature-server/scripts/install_app.sh b/packer/jambonz-feature-server/scripts/install_app.sh
index 88dfd0c..bfd5522 100755
--- a/packer/jambonz-feature-server/scripts/install_app.sh
+++ b/packer/jambonz-feature-server/scripts/install_app.sh
@@ -7,8 +7,12 @@ cp /tmp/ecosystem.config.js apps
 cd apps
 
 git clone https://github.com/jambonz/jambonz-feature-server.git -b ${VERSION}
+git clone https://github.com/jambonz/fsw-clear-old-calls.git
 
 cd /home/admin/apps/jambonz-feature-server && npm install
+cd /home/admin/apps/fsw-clear-old-calls && npm install && sudo npm install -g .
+
+echo "0 *	* * *	root    fsw-clear-old-calls --password JambonzR0ck$ >> /var/log/fsw-clear-old-calls.log 2>&1" | sudo tee -a /etc/crontab
 
 sudo -u admin bash -c "pm2 install pm2-logrotate"
 sudo -u admin bash -c "pm2 set pm2-logrotate:max_size 1G"
diff --git a/packer/jambonz-feature-server/scripts/install_drachtio.sh b/packer/jambonz-feature-server/scripts/install_drachtio.sh
index 2d27552..0db9838 100644
--- a/packer/jambonz-feature-server/scripts/install_drachtio.sh
+++ b/packer/jambonz-feature-server/scripts/install_drachtio.sh
@@ -11,9 +11,6 @@ git submodule update --init --recursive
 ./autogen.sh && mkdir -p build && cd $_ && ../configure CPPFLAGS='-DNDEBUG' && make -j 4 && sudo make install
 sudo mv /tmp/drachtio.conf.xml /etc
 sudo mv /tmp/drachtio.service /etc/systemd/system
-sudo mv /tmp/vimrc.local /etc/vim/vimrc.local
 sudo chmod 644 /etc/drachtio.conf.xml
 sudo chmod 644 /etc/systemd/system/drachtio.service
-sudo chmod 644 /etc/vim/vimrc.local
-sudo chown root:root /etc/drachtio.conf.xml /etc/systemd/system/drachtio.service /etc/vim/vimrc.local
 sudo systemctl enable drachtio
diff --git a/packer/jambonz-feature-server/template.json b/packer/jambonz-feature-server/template.json
index 06c7599..ae17a43 100644
--- a/packer/jambonz-feature-server/template.json
+++ b/packer/jambonz-feature-server/template.json
@@ -4,7 +4,7 @@
     "ssh_username": "admin",
     "ami_description": "jambonz feature server", 
     "instance_type": "t2.medium",
-    "drachtio_version": "v0.8.5",
+    "drachtio_version": "develop",
     "jambonz_version": "master"
   },
   "builders": [{