Clean up BCSWP