VE-566 code cleanup