Clean up of 3D->2D conversion.