Additional cleanup fields for classroom.