removed more entity array references