End of school cleanup and additions