ClippingBasic cleanup