clean up var defs