Clean up YCSP