Another attempt to cleanup stale remnants of the notifier subsystem.