Some notifier cleanup