more email validation
removed files not required