Cleaning up some loops

That didn't exclude all the removed zhu items.