Removed extraneous group by year, since we don't care about years (other than for
the initial filter step).