MDL-41290 SCORM: Tidy up after peer review