[PATCH OLK-5.10 0/1] clean code for cvm init