VE-119 code cleanup