LPS-43937 Refactor notifications until now to make them simpler