*8293* Deduping notification manager code