Cartesian2 cleanup