fix CS and remove dead code
fix 'from_email' should not be required per section