[bug 959270] Remove not needed comments, fixed csp work