Remove the use of average_* variables and use time_bnds variables instead

Remove the use of average_* variables and use time_bnds variables instead #492