Fix a few errors with CBPO
Remove print statements (CBPO)