Remove for student_selection working and some cleaning