ENH : cleanup CSP (Pipeline does not work yet)