config-vars clean up