getCustomClaim -> getClaim. Also, removed outdated TODOs.