#42: Spline cleanup