magl3 - 40 - some cleanup