Resolve external links in prod + cleaning it up