Cleanup of datamodel, example for Marcus.