CourseDao tested and verified and random clean up