Added cleanup for students