Remove more references to Location.course_id