MDE: models cleaned-up