diff --git a/helpers/make-ubuntu-mate-settings b/helpers/make-ubuntu-mate-settings
index 3fecbd3d7112df12b7b65622295d3288355752c0..9102eb207b895222ba3a92841d4499439b5161a5 100644
--- a/helpers/make-ubuntu-mate-settings
+++ b/helpers/make-ubuntu-mate-settings
@@ -89,15 +89,11 @@ image/x-gray=viewnior.desktop;gimp.desktop;
 image/svg+xml=viewnior.desktop;
 EOF
 
-# indicator-session is only needed for lightdm
-rm debian/indicator-session.desktop.in
-sed '/indicator-session.desktop/d' -i usr/lib/ubuntu-mate/ubuntu-mate-settings-overlay debian/ubuntu-mate-default-settings.install debian/rules
-
 sed '/fonts-ubuntu/d' -i debian/control
 
 #Remove caja's dropbox autostart.
-rm usr/bin/caja-dropbox-autostart
-rm usr/share/mate/autostart/caja-dropbox-autostart.desktop
+rm $(find -name caja-dropbox-autostart)
+rm $(find -name caja-dropbox-autostart.desktop)
 sed '/dropbox/d' -i debian/ubuntu-mate-default-settings.install
 
 changelog "Customized for Trisquel"