Remove the email config from sample config files again