diff --git a/scripts/restore b/scripts/restore
index a6ba731..cca40e1 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -34,10 +34,6 @@ ynh_script_progression --message="Restoring the data directory..." --weight=4
 
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
-mkdir -p $data_dir
-
-chmod 750 "$data_dir"
-chmod -R o-rwx "$data_dir"
 chown -R $app:www-data "$data_dir"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index a40beec..6a4fd36 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -28,24 +28,17 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 
 # Save the language used if not present
-if [ -z "$language" ]; then
+if [ -z "${language:-}" ]; then
   language="en"
   ynh_app_setting_set --app=$app --key=language --value=$language
 fi
 
 # If version setting doesn't exist
-if [ -z "$version" ]; then
+if [ -z "${version:-}" ]; then
   version="Enterprise"
   ynh_app_setting_set --app=$app --key=version --value=$version
 fi
 
-# If install_dir doesn't exist, create it
-if [ -z "$data_dir" ]; then
-  data_path=data_dir
-  data_dir="/home/yunohost.app/$app"
-  ynh_app_setting_set --app=$app --key=data_dir --value=$data_dir
-fi
-
 #=================================================
 # MIGRATING DATABASE
 #=================================================