Cleanup unused import
Do not ignore email_white_list if no email could be determined
Update copyright notices