Take out CSP, fix up x-frame-options