diff --git a/scripts/install b/scripts/install
index 8215b99..7fd1c07 100755
--- a/scripts/install
+++ b/scripts/install
@@ -6,8 +6,8 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source /usr/share/yunohost/helpers
 source _common.sh
+source /usr/share/yunohost/helpers
 
 #=================================================
 # MANAGE FAILURE OF THE SCRIPT
diff --git a/scripts/remove b/scripts/remove
index c8e2dbe..9633d1c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -6,8 +6,8 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source /usr/share/yunohost/helpers
 source _common.sh
+source /usr/share/yunohost/helpers
 
 #=================================================
 # LOAD SETTINGS
diff --git a/scripts/upgrade b/scripts/upgrade
index 24df8aa..dc6d4d0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -103,14 +103,9 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
-# Backup config, plugins and themes and delete previous files
-#ynh_keep_if_no_upgrade plugins/*
-#ynh_keep application/config/config.php
-#ynh_keep upload
-
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_script_progression --message="Upgrading source files..." --time --weight=1
+    ynh_script_progression --message="Upgrading source files..." --weight=1
 
     # Download, check integrity, uncompress and patch the source from app.src
     ynh_setup_source --dest_dir="$final_path" --keep="$final_path/plugins/* $final_path/application/config/config.php $final_path/upload"