Cleanup of the request.identity dict

work in progress...