Xwiki 9.11.4 high cpu issue and xwiki slow

Hum it is not simple for instant to upgrade xwiki version, because I’m home actually (because a nice doctor removed pieces of iron from my leg after my leg broken one year ago) and I need to merge all my customization before upgrade…

Anyways I found this old post about: Xwiki 10.5 entended cpu spike while adding new pages - #34 by gdelhumeau

I need to clean XWiki.Notifications.Code.NotificationFilterPreferenceClass object on every users
and set xwiki.plugin.watchlist.automaticwatch=none

Is it enough to fix my issue on xwiki 6.11.4 ?