Cleaned up email sending and watchdogs