Master page cleanup and CDNs eliminated