Fix the tld issue of the old site
Remove unused imports