fix regression issue SiteUrl not cleaned up