VE-739: Cleanup