Remove extra array use