remove_public_id does it now