Code cleanup of notifications and webhooks