Remove unuseful VC
Some code cleanup