Optimizr upgrade to remove internal redirects