Took out some old references to sample_avg