more cleanup in preparation for summer school