Use CDN where possible
Clean-up