cleanup in custom variable overrides per build