VE-589: Cleanup