diff --git a/scripts/remove b/scripts/remove
index 0500567..e3c4d0d 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,35 +1,73 @@
 #!/bin/bash
 
-# Source local helpers
-source ./_common.sh
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
 
-# Source app helpers
+source _common.sh
 source /usr/share/yunohost/helpers
 
-# Set app specific variables
+#=================================================
+# LOAD SETTINGS
+#=================================================
+
 app="$YNH_APP_INSTANCE_NAME"
-dbname=$app
-dbuser=$app
-
-# Drop MySQL database and user
-ynh_mysql_drop_db "$dbname"
-ynh_mysql_drop_user "$dbuser"
-
-# Retrieve domain from app settings
 domain=$(ynh_app_setting_get "$app" domain)
+final_path=$(ynh_app_setting_get "$app" final_path)
 
-# Delete app directory and configurations
-ynh_secure_remove "/var/www/${app}"
-ynh_secure_remove "/var/log/${app}"
-ynh_remove_fpm_config
-ynh_remove_nginx_config
+db_name=$app
+db_user=$app
+
+#=================================================
+# STANDARD REMOVE
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
 
-# Reload services
-service php5-fpm restart
-service nginx reload
+#=================================================
+# REMOVE THE MYSQL DATABASE
+#=================================================
+
+# Remove a database if it exists, along with the associated user
+ynh_mysql_remove_db "$db_user" "$db_name"
+
+#=================================================
+# REMOVE APP MAIN DIR
+#=================================================
+
+# Remove the app directory securely
+ynh_secure_remove "$final_path"
+
+#=================================================
+# REMOVE APP MAIN DIR
+#=================================================
+
+ynh_secure_remove "/var/log/$app"
+
+#=================================================
+# REMOVE NGINX CONFIGURATION
+#=================================================
+
+# Remove the dedicated nginx config
+ynh_remove_nginx_config
+
+#=================================================
+# REMOVE PHP-FPM CONFIGURATION
+#=================================================
+
+# Remove the dedicated php-fpm config
+ynh_remove_fpm_config
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+# REMOVE DEDICATED USER
+#=================================================
 
 # Remove the user account
 ynh_system_user_delete "$app"