diff --git a/scripts/install b/scripts/install
index 55ab73e..99e2cc6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -42,8 +42,7 @@ grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
 }
 
 # Install dependencies
-ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control \
-  || ynh_die "Unable to install dependencies"
+ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control
 
 # Create system user dedicace for this app
 ynh_system_user_create $app
diff --git a/scripts/restore b/scripts/restore
index f1b96d5..23d6508 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -76,64 +76,3 @@ sudo cp -a ./conf/php-fpm.ini "${phpfpm_ini}"
 sudo systemctl reload php5-fpm
 sudo systemctl reload nginx
 sudo yunohost app ssowatconf
-
-
-
-#!/bin/bash
-
-# Exit on command errors and treat unset variables as an error
-set -eu
-
-# Get multi-instances specific variables
-app=$YNH_APP_INSTANCE_NAME
-
-# Set app specific variables
-dbname=$app
-dbuser=$app
-
-# Source app helpers
-. /usr/share/yunohost/helpers
-
-# Retrieve old app settings
-domain=$(ynh_app_setting_get "$app" domain)
-path=$(ynh_app_setting_get "$app" path)
-dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
-
-# Check domain/path availability
-sudo yunohost app checkurl "${domain}${path}" -a "$app" \
-  || exit 1
-
-# Check destination directory
-DESTDIR="/var/www/$app"
-[[ -d $DESTDIR ]] && ynh_die \
-"The destination directory '$DESTDIR' already exists.\
- You should safely delete it before restoring this app."
-
-# Check configuration files
-nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
-[[ -f $nginx_conf ]] && ynh_die \
-"The NGINX configuration already exists at '${nginx_conf}'.
- You should safely delete it before restoring this app."
-phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf"
-[[ -f $phpfpm_conf ]] && ynh_die \
-"The PHP FPM configuration already exists at '${phpfpm_conf}'.
- You should safely delete it before restoring this app."
-
-# Restore the app files
-sudo cp -a ./sources "$DESTDIR"
-
-# Create and restore the database
-ynh_mysql_create_db $dbname $dbuser $dbpass
-ynh_mysql_connect_as $dbuser $dbpass $dbname < ./dump.sql
-
-# Fix installation directories and permissions
-sudo mkdir -p "${DESTDIR}/logs" "${DESTDIR}/temp"
-sudo chown -R $app: "$DESTDIR"
-
-# Restore configuration files
-sudo cp -a ./nginx.conf   "$nginx_conf"
-sudo cp -a ./php-fpm.conf "$phpfpm_conf"
-
-# Reload services
-sudo service php5-fpm restart || true
-sudo service nginx reload || true
diff --git a/scripts/upgrade b/scripts/upgrade
index c8166ae..1aa776f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -57,9 +57,7 @@ sudo chown -R admin: "${final_path}"
 init_composer "${final_path}"
 
 # Install the new Roundcube version
-sudo php "${TMPDIR}/bin/installto.sh" "$DESTDIR" --force --accept \
-  || ynh_die "Unable to update Roundcube installation"
-rm -rf "$TMPDIR"
+sudo php "${final_path}/bin/installto.sh" "$final_path" --force --accept
 
 # Generate a new random DES key
 deskey=$(ynh_string_random 24)