Clean up of modulestore references (primarly LMS).

STUD-1151