Yep sounds good. I think a 'cleanup: true' flag or something could work in the exports case. I guess for the define case the clean up can be left as a manual task.