VE-566 variable cleanup