Clean up var data model