Fix last 6 weeks average calculation

Also get rid of unused code and tests

@maxfliri
@pbadenski