WIP: Clean up of modulestore references (primarily LMS).