Removed references to course table and all