more cleanup of worksites
still more cleanup of worksites