Remove more email stuff