Removed more unneeded ids