Clean things up, accomodate all sites.