Remove commented code.
Adjust mailtext for SHOGun.