Cleanup public stats (bugs 985053, 1066119)