New heartbeat stat

Tidy it up so we're not being polluted by legacy data.