Fix the mail part of cleanup and update pathogen