Remove old claim code, make new claim merge on update