More preparations for nuking Identity endpoint.