moved clean_email() back to their original places