Re: get-fields cleanup