Cleanup for setup vars.
See #315