Enable CSP and clean up a bit.