Removing references to iD