further cleanup while reading GUI/Model/Mask

Merge request reports

Loading