*8293* Clean up NotificationManager in prep for move to PKP lib