Removed the email subscribe feature, fixed a couple missing changes from safe_yaml