Remove unused ClaimSaver class

Change-Id: Iffdca7762eecb0b716026e562664dc17a298e17a
Merge "Remove unused ClaimSaver class"