cleaning up var defs