get rid of some references to user_email