Switched to EntIndex, reverted EntityRemoved