CLEANUP: revert setting of vars