attempt at fixing and cleaning mosel models