Remove CVec entirely