[PATCH OLK-5.10] cvm: delete dead code and resolve macro definition holes