Fix for walk1 + grid2 cleanup