Fixed failing mails
Removed comments