Drop claimed_id & display_id, introduce google_id for UserOauth2 model