Statistics fix

Remove some unnecessary statistics calculations to make statistics script run faster