Got rid of the stupid do_sample switch which we never used