Revert "ClaimsApi"

This reverts commit 2fa6530559ea293700566a2eab8a6d7c85639268, reversing
changes made to d76fca6e59061297fd8ec16f39447be6f709a34d.