diff --git a/scripts/remove b/scripts/remove
index 2e491c3..df502c8 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -13,8 +13,12 @@ source /usr/share/yunohost/helpers
 
 ynh_script_progression "Removing system configurations related to $app..."
 
-if ynh_hide_warnings yunohost service status "$app" >/dev/null; then
-    yunohost service remove "$app"
+if ynh_hide_warnings yunohost service status "{$app}-backend" >/dev/null; then
+    yunohost service remove "{$app}-backend"
+fi
+
+if ynh_hide_warnings yunohost service status "{$app}-frontend" >/dev/null; then
+    yunohost service remove "{$app}-frontend"
 fi
 
 ynh_config_remove_systemd {$app}-backend
@@ -23,12 +27,6 @@ ynh_config_remove_systemd {$app}-frontend
 
 ynh_config_remove_nginx
 
-# Remove other various files specific to the app... such as:
-
-ynh_safe_rm "/etc/cron.d/$app"
-
-ynh_safe_rm "/etc/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================