Changed RP claims list to claims mappings
Cleanup