Tried to clean up NotificationHub interaction.