VE-655 code cleanup