Refactored Email adapter to NoCredential; General refactoring;