Merge "Remove unused RecoveryClaim file"