Rearrange field definitions & delete unused vars in GetDefectPayload