Cleaning up UserIdentity while looking for #21