Remove last reference to id_token fields for CM