diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index b7bcaaf7..b0d94216 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -222,19 +222,20 @@ function install_tahoelafs {
     git checkout $TAHOELAFS_COMMIT -b $TAHOELAFS_COMMIT
     git submodule update --init --recursive
     virtualenv venv --distribute
-    venv/bin/pip uninstall setuptools
+    venv/bin/pip uninstall --yes setuptools
     venv/bin/pip install setuptools==11.3
     venv/bin/pip install six==1.10.0 packaging==16.8 attrs==16.3.0 appdirs==1.4.2 pycrypto==2.1.0 cffi==1.9.1
     venv/bin/pip install cryptography==1.7.2 markerlib==0.6.0 distribute==0.7.3
     venv/bin/pip install --editable .
     configure_firewall_for_tahoelafs
 
-    if [ ! -d /home/tahoelafs/data ]; then
-        mkdir /home/tahoelafs/data
+    if [ -d /home/tahoelafs/data ]; then
+        rm -rf /home/tahoelafs/data
     fi
+    mkdir /home/tahoelafs/data
 
     # remove files we don't need
-    rm /home/tahoelafs/.mutt
+    rm -rf /home/tahoelafs/.mutt
     rm /home/tahoelafs/.emacs-mutt
     rm /home/tahoelafs/.muttrc
     rm /home/tahoelafs/.mutt-alias