Unnecessary arrays removed