cleanup everything

ThingML & Kermeta work