More cleanup of mailmate