[Geometry] BSpline cleanup