Better fix for the duplicator, thanks to wuestholz
Fix for boolVC generation
Merge
Fix to VC gen
Cleanup: removed unused code