More cleanup on stats hw.