Remove refs to email