Stats cleanup