diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index fc30295d663..62bfd8edb02 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -74,9 +74,9 @@
             # Dependency of notification_group, notification_request, thread_needaction_preview and thread_preview
             'mail/static/src/components/notification_list/notification_list_item.scss',
             'mail/static/src/component_hooks/*/*.js',
-            'mail/static/src/components/*/*.js',
-            'mail/static/src/components/*/*.scss',
-            'mail/static/src/components/*/*.xml',
+            'mail/static/src/components/*/*',
+            # Unused by guests and depends on ViewDialogs, better to remove it instead of pulling the whole view dependency tree
+            ('remove', 'mail/static/src/components/composer_suggested_recipient/*'),
             'mail/static/src/js/emojis.js',
             'mail/static/src/js/utils.js',
             'mail/static/src/model/*.js',
@@ -90,37 +90,19 @@
             'bus/static/src/js/*.js',
             'bus/static/src/js/services/bus_service.js',
             'web/static/lib/luxon/luxon.js',
-            'web/static/lib/py.js/lib/py.js',
             'web/static/src/core/**/*',
-            ('remove', 'web/static/src/core/debug/**/*.[js][scss]'),
+            # FIXME: debug menu currently depends on webclient, once it doesn't we don't need to remove the contents of the debug folder
+            ('remove', 'web/static/src/core/debug/**/*'),
             'web/static/src/env.js',
-            'web/static/src/legacy/js/_deprecated/basic_fields.js',
-            'web/static/src/legacy/js/_deprecated/data.js',
-            'web/static/src/legacy/js/chrome/action_mixin.js',
-            'web/static/src/legacy/js/components/*.js',
-            'web/static/src/legacy/js/control_panel/*.js',
-            'web/static/src/legacy/js/core/context.js',
-            'web/static/src/legacy/js/core/data_comparison_utils.js',
-            'web/static/src/legacy/js/core/domain.js',
             'web/static/src/legacy/js/core/misc.js',
-            'web/static/src/legacy/js/core/mvc.js',
-            'web/static/src/legacy/js/core/py_utils.js',
             'web/static/src/legacy/js/env.js',
-            'web/static/src/legacy/js/fields/*.js',
-            'web/static/src/legacy/js/model.js',
+            'web/static/src/legacy/js/fields/field_utils.js',
             'web/static/src/legacy/js/owl_compatibility.js',
-            'web/static/src/legacy/js/public/lazyloader.js',
             'web/static/src/legacy/js/services/data_manager.js',
             'web/static/src/legacy/js/services/session.js',
-            'web/static/src/legacy/js/views/**/*.js',
-            'web/static/src/legacy/js/widgets/data_export.js',
             'web/static/src/legacy/js/widgets/date_picker.js',
-            'web/static/src/legacy/js/widgets/domain_selector.js',
-            'web/static/src/legacy/js/widgets/domain_selector_dialog.js',
-            'web/static/src/legacy/js/widgets/model_field_selector.js',
             'web/static/src/legacy/legacy_rpc_error_handler.js',
             'web/static/src/legacy/utils.js',
-            'web/static/src/legacy/web_client.js',
             'web/static/src/legacy/xml/base.xml',
         ],
         'web._assets_primary_variables': [