Remove courseid confusion