cleanup + no more CDN