Remove usage of Claims fro StatementListDiffer