some cleanup changes for McEdu