Samples is now proprely rid of pgrest, with more clean-up to do