CDN cleanup.
Merge branch 'js-cdn-cleanup'