Removing remaining references to RangeSet