VE-1704: Cleanup