Cleaning up course functionality