Remove email properly