VE-1702: Cleanup