cleanupcode warnings and addvpi