2D segmentation cleanup