Lots of updates to pruning tokens