A couple more changes to remove code from the stats generation