Removed cbp2make stuff