Remove more old stuff.
Issue #2398431: Email is not being sent.