Fix mails
Remove comments