removed references to CSP classes