Remove cvector and ivector