Starting cleaning the modelcreator