remove duplicate email validation, fix static methods