Also remove these fields.