Cleanup -vgc implementation
Merge pull request #3405 from jpf91/cleanVGC

Cleanup -vgc implementation