actually, please remove the email class rules; we'll add them later in another patch if necessary but it's useless in this patch.