Remove more unused vc methods and simplified the code a bit more.