Remove extra fields set as null