Even more cleanup of BBP code