WIP simplification of Drupal side code for notifications handling