Finish up the url cleanup