further cleanup for nVCG