Cleanup notifications code