Removed active-diamond, updated clipper