Proper calculation of scratch/remove rights