various cleaning. Also CSP