Remove email_in_address and email_in_category site settings

Better specs and better SiteSettings