cleaning up DataModel