Don't recreate the set all the time
Cleaner valuaction cost calculation
Remove the non-incremental calculator

It is a maintenane burden for no benefit.