Remove reference to CVI