If we don't use this, just remove the capability?