Remove unneeded fields in return data