Remove unneeded array-length variables