Remove calc_mean (equivalent to Average)