diff --git a/scripts/install b/scripts/install
index a521a4e..d33a9e6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -92,7 +92,6 @@ ynh_script_progression "Setting up source files..."
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir/live"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir"
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index c963384..00b51c9 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -41,8 +41,6 @@ ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir"
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index f038f4a..8c2bb62 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,11 +15,7 @@ config="$install_dir/live/.env.production"
 ynh_script_progression "Ensuring downward compatibility..."
 
 # Set `service` settings to support `yunohost app shell` command
-# FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=service --value="$app-web.service"
-if [[ -z "${service:-}" ]]; then
-	service="$app-web.service"
-	ynh_app_setting_set --key=service --value="$service"
-fi
+ynh_add_setting_set_default --key=service --value="${app}-web.service"
 
 #Remove previous added repository
 ynh_remove_extra_repo
@@ -84,8 +80,6 @@ ynh_script_progression "Upgrading source files..."
 # Download Mastodon
 ynh_setup_source --dest_dir="$install_dir/live" --full_replace --keep="public/system/"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir"
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
@@ -95,9 +89,6 @@ language="$(echo $language | head -c 2)"
 
 ynh_config_add --template=".env.production.sample" --destination="$config"
 
-#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$config"
-#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:$app" "$config"
-
 #=================================================
 # BUILD ASSETS
 #=================================================
@@ -160,7 +151,6 @@ ynh_config_add --template="cron" --destination="/etc/cron.d/$app"
 
 # Use logrotate to manage app-specific logfile(s)
 ynh_config_add_logrotate
-#REMOVEME? Assuming ynh_config_add_logrotate is called, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:$app" "/var/log/$app"
 
 #=================================================
 # START SYSTEMD SERVICE