Clean up map_into_course