clean up var statements