Remove needless array index references