Clean up DataModel