Remove sys:statistics, clean up a bit