Cleaup for cbpy warnings