merging in #2610 remove pbcpp.py