Remove email refs