Cleanup how per system statistics are handled