Get rid of array_walk